调整出库接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementStorageController.java

@@ -39,7 +39,7 @@ public class TWarehouseAgreementStorageController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseAgreement tWarehouseAgreement) {
         startPage();
-        tWarehouseAgreement.setfFeetypeid((long) 0);
+        tWarehouseAgreement.setfFeetypeid(0L);
         List<Map<String, Object>> list = tWarehouseAgreementService.selectTWarehouseAgreementList1(tWarehouseAgreement);
         return getDataTable(list);
     }

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

@@ -85,7 +85,7 @@ public class TWarehouseInStockController extends BaseController {
     @PostMapping(value = "/add")
     @RepeatSubmit
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
-                          @RequestParam("tWhgenleg") String tWhgenleg,
+                          @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
@@ -95,7 +95,7 @@ public class TWarehouseInStockController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
     }
 
     /**
@@ -106,7 +106,7 @@ public class TWarehouseInStockController extends BaseController {
     @PostMapping(value = "/warehouseSubmission")
     @RepeatSubmit
     public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
-                                          @RequestParam("tWhgenleg") String tEnclosure,
+                                          @RequestParam("tEnclosure") String tEnclosure,
                                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {

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

@@ -512,9 +512,38 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
                                           String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType) {
         Long fPid = null;
+        boolean isApprove = false;
+        String key = "";
+        long actId = 0L;
+        if ("SJRK".equals(billsType)) {
+            actId = 110L;
+            key = "warehouse.inStock.ApprovalFlow";
+        } else if ("SJCK".equals(billsType)) {
+            actId = 120L;
+            key = "warehouse.outStock.ApprovalFlow";
+        } else if ("CKDB".equals(billsType)) {
+            // 调拨业务待维护
+            actId = 130L;
+            key = "warehouse.adjustment.ApprovalFlow";
+        } else if ("HQZY".equals(billsType)) {
+            actId = 140L;
+            key = "warehouse.transfer.ApprovalFlow";
+        }
+        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
+        if (StringUtils.isNull(sysConfig)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("系统参数异常，未找到开启审批流参数");
+        }
+        if ("0".equals(sysConfig.getConfigValue())) {
+            isApprove = true;
+        }
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
         if (StringUtils.isNull(warehouseBills.getfId())) {
-            warehouseBills.setfBillstatus(4L);
+            if (isApprove) {
+                warehouseBills.setfBillstatus(4L);
+            } else {
+                warehouseBills.setfBillstatus(6L);
+            }
             warehouseBills.setfBilltype(billsType);
             warehouseBills.setfChargedate(warehouseBills.getfBsdate());
             warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
@@ -528,7 +557,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fPid = warehouseBills.getfId();
         } else {
             fPid = warehouseBills.getfId();
-            warehouseBills.setfBillstatus(4L);
+            if (isApprove) {
+                warehouseBills.setfBillstatus(4L);
+            } else {
+                warehouseBills.setfBillstatus(6L);
+            }
             warehouseBills.setUpdateTime(new Date());
             warehouseBills.setfChargedate(warehouseBills.getfBsdate());
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
@@ -584,7 +617,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
                 wbCr.setfPid(fPid);
                 wbCr.setfDc("C");
-                wbCr.setfBillstatus(4L);
                 wbCr.setCreateTime(new Date());
                 wbCr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
@@ -596,7 +628,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
                 wbDr.setfPid(fPid);
                 wbDr.setfDc("D");
-                wbDr.setfBillstatus(4L);
+                if (isApprove) {
+                    wbDr.setfBillstatus(4L);
+                } else {
+                    wbDr.setfBillstatus(6L);
+                }
                 wbDr.setCreateTime(new Date());
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
@@ -616,31 +652,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
         // 这里加个判断取系统参数来确定是否需要启用审批流
-        String key = "";
-        boolean isApprove = false;
-        long actId = 0L;
-        if ("SJRK".equals(billsType)) {
-            actId = 110L;
-            key = "warehouse.inStock.ApprovalFlow";
-        } else if ("SJCK".equals(billsType)) {
-            actId = 120L;
-            key = "warehouse.outStock.ApprovalFlow";
-        } else if ("CKDB".equals(billsType)) {
-            // 调拨业务待维护
-            actId = 130L;
-            key = "warehouse.adjustment.ApprovalFlow";
-        } else if ("HQZY".equals(billsType)) {
-            actId = 140L;
-            key = "warehouse.transfer.ApprovalFlow";
-        }
-        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
-        if (StringUtils.isNull(sysConfig)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("系统参数异常，未找到开启审批流参数");
-        }
-        if ("0".equals(sysConfig.getConfigValue())) {
-            isApprove = true;
-        }
         if (isApprove) {
             AuditItems auditItems = new AuditItems();
             auditItems.setLevelId(0L);
@@ -833,9 +844,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
                         return AjaxResult.error("库存明细第" + i + "行请检查客户信息，操作终止");
                     }
-
-
-
                     /*long fCorpid = tWarehouseBills.getfCorpid();
                     TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
                     long fGoodsid = tGoods.getfTypeid();
@@ -971,22 +979,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 生成流水号
             Date time = new Date();
             String serialNumber;
-            if (billtystatus.equals("20")) { // 生成 入库 流水号
-                serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
-                item.setfSerialNumber(serialNumber);
-            } else if (billtystatus.equals("70")) { //生成 出库 流水号
-                serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
-                item.setfSerialNumber(serialNumber);
-            }
-            item.setfBillstatus(status);
-            item.setUpdateTime(new Date());
-            item.setUpdateBy(loginUser.getUser().getUserName());
-            int num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
-            // 添加状态log
-            insertTWarehousebillsLog(item, status, loginUser);
-            if (num <= 0) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("更新库存明细失败");
+            if (item.getfBillstatus() < 20L) {
+                if (billtystatus.equals("20")) { // 生成 入库 流水号
+                    serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
+                    item.setfSerialNumber(serialNumber);
+                } else if (billtystatus.equals("70")) { //生成 出库 流水号
+                    serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
+                    item.setfSerialNumber(serialNumber);
+                }
+                item.setfBillstatus(status);
+                item.setUpdateTime(new Date());
+                item.setUpdateBy(loginUser.getUser().getUserName());
+                int num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
+                // 添加状态log
+                insertTWarehousebillsLog(item, status, loginUser);
+                if (num <= 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("更新库存明细失败");
+                }
             }
             tWarehousebillsitemsList.add(item);
         }
@@ -1480,7 +1490,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
-
     /**
      * 撤销入账
      *
@@ -1585,7 +1594,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebillsitems.setfPid(warehouseBill.getfId());
         List<TWarehousebillsitems> warehousebillsitemsList1 = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
         for (TWarehousebillsitems item : warehousebillsitemsList1) {
-            if (item.getfBillstatus().equals(40L) | item.getfBillstatus().equals(90L)) {
+            if (item.getfBillstatus().equals(40L)) {
                 Stored++;
             } else {
                 notInStorage++;

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -93,6 +93,7 @@
             leg.f_grossweightD AS fGrossweightD,
             leg.f_netweightD AS fNetweightD,
             leg.f_volumnC AS fVolumnC,
+            leg.f_volumnblc AS fVolumnblc,
             leg.f_qtyC AS fQtyC,
             leg.f_grossweightC AS fGrossweightC,
             leg.f_netweightC AS fNetweightC,

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementMapper.xml

@@ -57,7 +57,8 @@
                 agre.f_id AS fId,
                 corp.f_name AS fCorpid,
                 agre.f_contractno AS fContractno,
-                goods.f_name AS fGoodsid,
+                goods.f_id AS fGoodsid,
+                goods.f_name AS fGoodsids,
                 agre.t_packages AS tPackages,
                 agre.f_begindate AS fBegindate,
                 agre.f_enddate AS fEnddate,

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -112,6 +112,7 @@
             goods.f_name AS fGoodsids,
             item.f_warehouselocid AS fWarehouselocid,
             area.f_name AS fWarehouselocids,
+            item.f_is_pass AS fIsPass,
             item.f_originalbillno AS fOriginalbillno,
             item.f_mblno AS fMblno,
             item.f_bsdate AS fBsdate,