出库单的删除接口

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java

@@ -22,6 +22,8 @@ public class OutStorehouseListing extends BaseEntity {
     private String storeHouseName	;//varchar	100					仓库名称
     @NotBlank(message = "质物名称不能为空")
     private String proName;//	varchar	50					质物名称
+    @NotBlank(message = "质物名称不能为空")
+    private String proSid;//	varchar	50					质物sid
     @NotBlank(message = "规格（型号）不能为空")
     private String proModel	;//varchar	50					规格（型号）
     private String proUnit	;//varchar	50					规格单位

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java

@@ -1,6 +1,7 @@
 package com.wh.controller.api.output;
 
 import com.wh.pojo.api.*;
+import com.wh.pojo.purchasenew.Purchasenew;
 import com.wh.service.api.outstorehouse.OutStorehouseListingService;
 import com.wh.service.api.outstorehouse.OutStorehouseMainService;
 import com.wh.vo.SysResult;
@@ -43,10 +44,13 @@ public class OutStorehouseMainController {
     public ResultBean delBySids(@RequestBody String[] sids){
         ResultBean rb = ResultBean.fireFail();
         for (String sid : sids) {
-            int i = outStorehouseMainService.deleteBySid(sid);
+            outStorehouseMainService.fetchBySid(sid)
-            int ii=outStorehouseListingService.deleteByMainSid(sid);
+            int state = entity.getState();
+            if(2==state){
+                continue;
+            }
+            int i = outStorehouseMainService.deleteOutStorehouseMainBySid(sid);
         }
-
         return rb.success();
     }
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java

@@ -8,7 +8,9 @@ import org.apache.ibatis.annotations.Update;
 
 
 public interface ProdStockMapper extends BaseMapper<ProdStock> {
-    @Update("update prod_stock set  num=num-#{num} where pro_sid=#{proSid} and custer_sid=#{custerSid}")
+    @Update("update prod_stock set  num=num-#{num} , calculated_value=(num*confirmed_price)  where pro_sid=#{proSid} and custer_sid=#{custerSid}")
     void reduceNumByProdSidAndCustSid(@Param("proSid") String proSid, @Param("custerSid")String custerSid,
                                       @Param("num")String num);
+    @Update("update prod_stock set  num=num+#{num}, calculated_value=(num*confirmed_price)  where pro_sid=#{proSid} and custer_sid=#{custerSid}")
+    void addNumByProdSidAndCustSid(String proSid, String custerSid, String num);
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java

@@ -19,6 +19,7 @@ import com.wh.mapper.storehousemanage.RemoveMapper;
 import com.wh.pojo.*;
 import com.wh.pojo.api.*;
 import com.wh.service.api.instorehouse.InStorehouseListingService;
+import com.wh.service.api.instorehouse.InStorehouseMainService;
 import com.wh.service.api.prodstock.ProdStockService;
 import com.wh.vo.PageResult;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -44,6 +45,8 @@ public class OutStorehouseMainService extends MybatisBaseService<OutStorehouseMa
     private OutStorehouseListingService outStorehouseListingService;
     @Autowired
     private ProdStockService prodStockService;
+    @Autowired
+    private InStorehouseMainService inStorehouseMainService;
     @Transactional
     public ResultBean addOutStorehouse(OutStorehouseMainDto outStorehouseMainDto) {
         ResultBean<Object> r = ResultBean.fireFail();
@@ -216,4 +219,14 @@ public class OutStorehouseMainService extends MybatisBaseService<OutStorehouseMa
         osv.setList(list);
         return ResultBean.fireSuccess().setData(osv);
     }
+@Transactional
+    public int deleteOutStorehouseMainBySid(String sid) {
+        int i = deleteBySid(sid);
+        List<OutStorehouseListing> list=outStorehouseListingService.selectInStorehouseListingsByMainSid(sid);
+        int ii=outStorehouseListingService.deleteByMainSid(sid);
+        list.forEach(l->{
+            prodStockService.addNumByProdSidAndCustSid(l.getProSid(), l.getCusterSid(),l.getRealityNum());
+         });
+        return i;
+    }
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java

@@ -63,4 +63,7 @@ public class ProdStockService extends MybatisBaseService<ProdStockMapper, ProdSt
     public void reduceNumByProdSidAndCustSid(String proSid, String custerSid, String num) {
         baseMapper.reduceNumByProdSidAndCustSid(proSid,custerSid,num);
     }
+    public void addNumByProdSidAndCustSid(String proSid, String custerSid, String num) {
+        baseMapper.addNumByProdSidAndCustSid(proSid,custerSid,num);
+    }
 }