[CODE]: 库存明细状态、仓库主表对应状态

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -372,16 +372,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
             fPid = warehouseBills.getfId();
         } else {
-            /*// 提交时：  生流水号
-            if ("6".equals(warehouseBills.getfBillstatus())) {
-                // 业务编码
-                String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
-                warehouseBills.setfBillno(billNo);
-                // 存货编码
-                Date time = new Date();
-                String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
-                warehouseBills.setfBscorpno(bscorpno);
-            }*/
             fPid = warehouseBills.getfId();
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
@@ -473,10 +463,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if(wbItem.getfBillstatus()==null){
                     wbItem.setfBillstatus("1");
                     notInStorage++;
-                }else if(wbItem.getfBillstatus().equals('6')) {
+                }else if(wbItem.getfBillstatus().equals("6")) {
                     wbItem.setfBillstatus("6");
                     Stored++;
-                } else if(wbItem.getfBillstatus().equals('1')){
+                } else if(wbItem.getfBillstatus().equals("1")){
                     wbItem.setfBillstatus("1");
                     notInStorage++;
                 }
@@ -490,9 +480,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 录入库存明细整体状态
             TWarehouseBills warehouseBill=new TWarehouseBills();
             warehouseBill.setfId(fPid);
-            if(Stored==0){ // 未入库
+            if(Objects.equals(Stored,0)){ // 未入库
                 warehouseBill.setfItemsStatus("1");
-            } else if(notInStorage==0){ // 已入库
+            } else if(Objects.equals(notInStorage,0)){ // 已入库
                 warehouseBill.setfItemsStatus("6");
             } else { // 有已入库、有未入库
                 warehouseBill.setfItemsStatus("2");
@@ -577,7 +567,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBills.setCreateTime(new Date());
             tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
             // 已入账
-            tWarehouseBills.setfBillstatus("7");
+            tWarehouseBills.setfBillstatus("2");
             tWarehouseBillsMapper.insertTWarehousebills(tWarehouseBills);
             fPid = tWarehouseBills.getfId();
         }
@@ -605,6 +595,32 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
             }
         }
+        // 查询所有库存明细 修改仓库主表状态
+        int  notInStorage=0;
+        int  Stored=0;
+        TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
+        tWarehousebillsitems.setfPid(fPid);
+        List<TWarehousebillsitems> warehousebillsitemsList1 =tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
+        for(TWarehousebillsitems item:warehousebillsitemsList1){
+            if(item.getfBillstatus()==null){
+                notInStorage++;
+            }else if(item.getfBillstatus().equals("6")) {
+                Stored++;
+            } else if(item.getfBillstatus().equals("1")){
+                notInStorage++;
+            }
+        }
+         // 录入库存明细整体状态
+        TWarehouseBills warehouseBill=new TWarehouseBills();
+        warehouseBill.setfId(fPid);
+        if(Objects.equals(Stored,0)){ // 未入库
+            warehouseBill.setfItemsStatus("1");
+        } else if(Objects.equals(notInStorage,0)){ // 已入库
+            warehouseBill.setfItemsStatus("6");
+        } else { // 有已入库、有未入库
+            warehouseBill.setfItemsStatus("2");
+        }
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBill);
         if (StringUtils.isNotNull(whgenleg) && !"[]".equals(whgenleg)) {
             JSONArray jsonDrArray = JSONArray.parseArray(whgenleg);
             List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);