保存出入库行为

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdOrderDetails.java

@@ -98,4 +98,16 @@ public class JdOrderDetails extends BasePo {
     private Date handleTime;
     /**快递单号**/
     private String expressNo;
+    /**增加仓库ID**/
+    private Long addWarehouseId;
+    /**增加库存数量**/
+    private BigDecimal addQuantity;
+    /**增加商品id**/
+    private Long addProductId;
+    /**减少仓库id**/
+    private Long reduceWarehouseId;
+    /**减少库存数量**/
+    private BigDecimal reduceQuantity;
+    /**减少商品id**/
+    private Long reduceProductId;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdOrderDetailsVo.java

@@ -32,30 +32,6 @@ public class JdOrderDetailsVo extends JdOrderDetails {
     private String productCustomCode;
 
 
-    /**
-     * 增加仓库id
-     */
-    private Long addWarehouseId;
-    /**
-     * 增加库存数量
-     */
-    private BigDecimal addQuantity;
-    /**
-     * 增加商品id
-     */
-    private Long addProductId;
-    /**
-     * 减少仓库id
-     */
-    private Long reduceWarehouseId;
-    /**
-     * 减少库存数量
-     */
-    private BigDecimal reduceQuantity;
-    /**
-     * 减少商品id
-     */
-    private Long reduceProductId;
 
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderDetailsServiceImpl.java

@@ -109,7 +109,7 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
         switch (vo.getExHandle()){
             case RunParamConstant.MULTI_CARGO_REDUCE_STOCK:
                 //弹窗提示，出库，减少库存
-                reduceStock(vo);
+                reduceStock(vo, byId);
                 break;
             case RunParamConstant.SHIPPED_DAMAGE:
             case RunParamConstant.SHIPPED_CLAIM:
@@ -122,7 +122,7 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
                 break;
             case RunParamConstant.SHORTAGE_RETURN:
                 //选择仓库，增加库存
-                addStock(vo);
+                addStock(vo, byId);
                 break;
             case RunParamConstant.EXCESS_RETURN:
             case RunParamConstant.BARCODE_ERROR_RETURN:
@@ -130,7 +130,7 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
                 break;
             case RunParamConstant.EXCESS_NOT_RETURN:
                 //增减库存
-                addAndReduceStock(vo);
+                addAndReduceStock(vo, byId);
                 break;
             case RunParamConstant.EXCESS_DAMAGE:
                 //填备注增减库存
@@ -180,7 +180,7 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
             throw new RuntimeException("快递单号不能为空");
         }
         jdOrderDetails.setExpressNo(expressNo);
-        addStock(vo);
+        addStock(vo, jdOrderDetails);
     }
 
     /**
@@ -188,9 +188,9 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
      * @author hj
      * @date 2024/1/15 22:42
      */
-    private void addAndReduceStock(JdOrderDetailsVo vo) {
-        addStock(vo);
-        reduceStock(vo);
+    private void addAndReduceStock(JdOrderDetailsVo vo, JdOrderDetails jdOrderDetails) {
+        addStock(vo, jdOrderDetails);
+        reduceStock(vo, jdOrderDetails);
     }
 
 
@@ -201,17 +201,20 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
      */
     private void fillRemarkAndAddReduceStock(JdOrderDetailsVo vo, JdOrderDetails jdOrderDetails) {
         fillRemark(vo, jdOrderDetails);
-        addStock(vo);
-        reduceStock(vo);
+        addStock(vo, jdOrderDetails);
+        reduceStock(vo, jdOrderDetails);
     }
 
     /**
      * 增加库存
      * @param vo
      */
-    private void addStock(JdOrderDetailsVo vo) {
+    private void addStock(JdOrderDetailsVo vo, JdOrderDetails jdOrderDetails) {
         //操作库存及记录
         operateStock(vo.getAddWarehouseId(), RunParamConstant.INBOUND, vo.getAddQuantity(), vo.getAddProductId());
+        jdOrderDetails.setAddProductId(vo.getAddProductId());
+        jdOrderDetails.setAddQuantity(vo.getAddQuantity());
+        jdOrderDetails.setAddWarehouseId(vo.getAddWarehouseId());
     }
 
     /**
@@ -219,9 +222,12 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
      * @author hj
      * @date 2024/1/15 22:44
      */
-    private void reduceStock(JdOrderDetailsVo vo) {
+    private void reduceStock(JdOrderDetailsVo vo, JdOrderDetails jdOrderDetails) {
         //操作库存及记录
         operateStock(vo.getReduceWarehouseId(), RunParamConstant.OUTBOUND, vo.getReduceQuantity(), vo.getReduceProductId());
+        jdOrderDetails.setReduceProductId(vo.getReduceProductId());
+        jdOrderDetails.setReduceQuantity(vo.getReduceQuantity());
+        jdOrderDetails.setReduceWarehouseId(vo.getReduceWarehouseId());
     }