[CODE]: 暂存不考虑库存总账，提交校验附件是否添加

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -97,10 +97,13 @@ public class TWarehouseInStockController extends BaseController {
         if (tWarehousebillsitems.equals("[]")) {
             return AjaxResult.error("提交失败：请检查库存明细数据");
         }
+        if (tWhgenleg.equals("[]")) {
+            return AjaxResult.error("提交失败：请检查附件信息");
+        }
         if (tWarehousebillsfeesDr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查收款明细数据");
         }
-        if (tWarehousebillsitems.equals("[]")) {
+        if (tWarehousebillsfeesCr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查付款明细数据");
         }
         /*if (StringUtils.isEmpty(tWarehousebillsitems)) {

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

@@ -256,39 +256,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tEnclosureMapper.deleteByFPid(fPid);
         }
 
-        /*if (tWhgenleg != null) {
-            JSONArray whgenlegJSON = JSONArray.parseArray(tWhgenleg);
-            List<TEnclosure> enclosures = JSONObject.parseArray(whgenlegJSON.toJSONString(), TEnclosure.class);
-            for (TEnclosure enclosure : enclosures) {
-                enclosure.setfPid(warehouseBills.getFId());
-                enclosure.setCreateBy(loginUser.getUser().getUserName());
-                enclosure.setCreateTime(new Date());
-                tEnclosureMapper.insertTEnclosure(enclosure);
-            }
-        }*/
-        /*if (tWarehousebillsfeesCr != null) {
-            JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
-            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
-            for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                wbCr.setfPid(warehouseBills.getFId());
-                wbCr.setfDc("C");
-                wbCr.setCreateBy(loginUser.getUser().getUserName());
-                wbCr.setCreateTime(new Date());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-            }
-        }
-        if (tWarehousebillsfeesDr != null) {
-            JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
-            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
-            for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                wbDr.setfPid(warehouseBills.getFId());
-                wbDr.setfDc("D");
-                wbDr.setCreateBy(loginUser.getUser().getUserName());
-                wbDr.setCreateTime(new Date());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-            }
-        }*/
-
         // 库存明细添加
         if (tWarehousebillsitems != null) {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
@@ -352,8 +319,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
 
-        // 查询库存总账
-        if (tWarehousebillsitems != null) {
+        // 查询库存总账   库存明细不为空 并且 入库不是暂存状态 进行库存总账的查询新增修改
+        if (tWarehousebillsitems != null && !warehouseBills.getfBillstatus().equals("2")) {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
             List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
@@ -372,13 +339,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
 
-        // 后续 添加优化 计算数据是否正确
-        /*for (TWarehousebillsfees wFees : warehousebillsfeesCrList) {
-            if (Objects.equals(0, wFees.getfFeeunitid())) {
-
-            }
-            wFees.setfAmount();
-        }*/
         return AjaxResult.success();
     }