Explorar el Código

[CODE]: 明细流水号

maxianghua hace 4 años
padre
commit
b1fd0412ca

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

@@ -449,6 +449,21 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
             List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
+                if(StringUtils.isNull(wbItem.getfSerialNumber())){
+                    // 生成流水号
+                    Date time = new Date();
+                    String serialNumber;
+                    if ("SJRK".equals(billsType)) { // 生成 入库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
+                        wbItem.setfSerialNumber(serialNumber);
+                    } else if ("SJCK".equals(billsType)) { //生成 出库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
+                        wbItem.setfSerialNumber(serialNumber);
+                    } else if ("CKDB".equals(billsType)) { //生成 出库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
+                        wbItem.setfSerialNumber(serialNumber);
+                    }
+                }
                 boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType);
                 // 仓储计费日期
                 wbItem.setfBilltype(billsType);
@@ -1228,10 +1243,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         for (TWarehousebillsitems item : warehousebillsitemsList) {
             // 生成流水号
-            Date time = new Date();
-            String serialNumber;
+            /*Date time = new Date();
+            String serialNumber;*/
             if (item.getfBillstatus() < 30L) {
-                if ("RK".equals(billtystatus)) { // 生成 入库 流水号
+               /* if ("RK".equals(billtystatus)) { // 生成 入库 流水号
                     serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
                     item.setfSerialNumber(serialNumber);
                 } else if ("CK".equals(billtystatus)) { //生成 出库 流水号
@@ -1240,7 +1255,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 } else if ("DB".equals(billtystatus)) { //生成 出库 流水号
                     serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
                     item.setfSerialNumber(serialNumber);
-                }
+                }*/
                 item.setfBillstatus(status);
                 item.setUpdateTime(new Date());
                 item.setUpdateBy(loginUser.getUser().getUserName());