提供库存扣减和库存恢复的接口

d6d16e7e · zhangqiliang · ba6acc81 · d6d16e7e · d6d16e7e · d6d16e7e
--- a/src/main/java/com/boco/nbd/wios/manage/controller/WarehouseController.java
+++ b/src/main/java/com/boco/nbd/wios/manage/controller/WarehouseController.java
@@ -14,22 +14,27 @@ import com.boco.nbd.wios.manage.service.impl.WarehouseService;
 import com.boco.nbd.wios.manage.util.NumberUtil;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.util.HttpClientUtils;
+import com.ihidea.core.util.XMLUtilsEx;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.Header;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import javax.annotation.Resource;
+import javax.crypto.spec.PSource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.List;
+import java.util.Map;
 /**
 * 仓库管理接口
@@ -364,18 +369,35 @@ public class WarehouseController {
    /**
     * 确认退货之后恢复库存数量
-     *
+     *@param params
-     * @param materialsQuery
+     * @param url
     * @return
     */
    @PostMapping(value = "reject/restoreInventoryQuantity")
    @ApiOperation(value = "确认退货之后更新库存数量")
-    public BaseResponse<Void> restoreInventoryQuantity(MaterialsQuery materialsQuery) {
+    public BaseResponse<Void> restoreInventoryQuantity(String url, Map<String, String> params) {
-        MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(materialsQuery.getMaterialsCode());
+        System.out.println("获取数据"+params);
+        MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(params.get("materialsCode"));
+        if (materials==null){
+            throw new ServiceException("物料不存在");
+        }
+        materialsMapperEx.RestoreInventoryQuantity(params.get("warehouseId"),materials.getId(), BigDecimal.valueOf(1));
+        return new BaseResponse<>();
+    }
+    /**
+     * 确认收货之后库存扣减
+     *@param params
+     * @param url
+     * @return
+     */
+    @PostMapping(value = "reject/reduceInventoryQuantity")
+    @ApiOperation(value = "确认收货之后库存扣减")
+    public BaseResponse<Void> reduceInventoryQuantity(String url, Map<String, String> params) {
+        MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(params.get("materialsCode"));
        if (materials==null){
            throw new ServiceException("物料不存在");
        }
-        materialsMapperEx.RestoreInventoryQuantity(materialsQuery.getWarehouseId(),materials.getId(), BigDecimal.valueOf(1));
+        materialsMapperEx.reduceInventoryQuantity(params.get("warehouseId"),materials.getId(), BigDecimal.valueOf(1));
        return new BaseResponse<>();
    }
 }
--- a/src/main/java/com/boco/nbd/wios/manage/mapper/extdb/MaterialsMapperEx.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/extdb/MaterialsMapperEx.java
@@ -105,6 +105,14 @@ public interface MaterialsMapperEx {
     * @return
     */
    int RestoreInventoryQuantity(@Param("warhouseId") String warhouseId, @Param("materialsId")String materialsId, @Param("quantity")BigDecimal quantity);
+    /**
+     * 确认收货之后库存扣减
+     * @param warhouseId
+     * @param materialsId
+     * @param quantity
+     * @return
+     */
+    int reduceInventoryQuantity(@Param("warhouseId") String warhouseId, @Param("materialsId")String materialsId, @Param("quantity")BigDecimal quantity);
    /**

--- a/src/main/resources/mybatis/mapper/extdb/common/MaterialsMapperEx.xml
+++ b/src/main/resources/mybatis/mapper/extdb/common/MaterialsMapperEx.xml
@@ -194,6 +194,7 @@
    <update id="RestoreInventoryQuantity">
        UPDATE t_warehouse_materials
        SET
+            total_number = total_number + #{quantity},
            has_number = has_number - #{quantity},
            remaining_number = remaining_number + #{quantity},
            stay_with_number = stay_with_number + #{quantity}
@@ -201,6 +202,17 @@
        warehouse_id = #{warhouseId}
        AND materials_id = #{materialsId}
    </update>
+    <update id="reduceInventoryQuantity">
+        UPDATE t_warehouse_materials
+        SET
+            total_number = total_number - #{quantity},
+            has_number = has_number + #{quantity},
+            remaining_number = remaining_number - #{quantity},
+            stay_with_number = stay_with_number - #{quantity}
+        WHERE
+            warehouse_id = #{warhouseId}
+          AND materials_id = #{materialsId}
+    </update>
    <insert id="insertWarehouseMaterials">