[CODE]: 流水号生成

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

@@ -259,9 +259,12 @@ public class TWarehouseInStockController extends BaseController {
 
 
     /**
-     *   请核流程
-     *
+     *   明細流水号
      */
-
+    @PostMapping(value = "/serialNumber")
+    public AjaxResult serialNumber() {
+        String billsType = "SJRK";
+        return itWarehouseBillsService.serialNumber(billsType);
+    }
 
 }

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

@@ -276,5 +276,13 @@ public class TWarehouseOutStockController extends BaseController {
                 warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
     }
 
+    /**
+     *   明細流水号
+     */
+    @PostMapping(value = "/serialNumber")
+    public AjaxResult serialNumber() {
+        String billsType = "SJCK";
+        return itWarehouseBillsService.serialNumber(billsType);
+    }
 
 }

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

@@ -268,4 +268,13 @@ public class TWarehouseStockTransferController extends BaseController {
                 warehousebillsfeesDr, loginUser, billsType);
     }
 
+    /**
+     *   明細流水号
+     */
+    @PostMapping(value = "/serialNumber")
+    public AjaxResult serialNumber() {
+        String billsType = "CKDB";
+        return itWarehouseBillsService.serialNumber(billsType);
+    }
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -185,4 +185,7 @@ public interface ITWarehouseBillsService {
     List<Map<String, Object>> selectInventoryList(TWarehouseBills tWarehouseBills);
 
     public List<TWareHouseItemsExcel> selectTWarehousebillsItemsList(TWarehouseBills tWarehouseBills);
+
+    AjaxResult serialNumber( String billsType);
+
 }

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

@@ -449,7 +449,7 @@ 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())){
+                /*if(StringUtils.isNull(wbItem.getfSerialNumber())){
                     // 生成流水号
                     Date time = new Date();
                     String serialNumber;
@@ -463,7 +463,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
                         wbItem.setfSerialNumber(serialNumber);
                     }
-                }
+                }*/
                 boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType);
                 // 仓储计费日期
                 wbItem.setfBilltype(billsType);
@@ -794,6 +794,22 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehouseBillsMapper.selectTWarehousebillsItemList(tWarehouseBills);
     }
 
+    @Override
+    public AjaxResult serialNumber(String billsType) {
+        Map<String, Object> map = new HashMap<>();
+        Date time = new Date();
+        String serialNumber = null;
+         if ("SJRK".equals(billsType)) { // 生成 入库 流水号
+             serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
+         } else if ("SJCK".equals(billsType)) { //生成 出库 流水号
+             serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
+         } else if ("CKDB".equals(billsType)) { //生成 出库 流水号
+             serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
+         }
+         map.put("fSerialNumber",serialNumber);
+        return AjaxResult.success("成功",map);
+    }
+
     /**
      * 根据仓库主表id 更新对应明细表状态
      *
@@ -1243,9 +1259,21 @@ 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(StringUtils.isNull(item.getfSerialNumber())){
+                    if ("RK".equals(billtystatus)) { // 生成 入库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
+                        item.setfSerialNumber(serialNumber);
+                    } else if ("CK".equals(billtystatus)) { //生成 出库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
+                        item.setfSerialNumber(serialNumber);
+                    } else if ("DB".equals(billtystatus)) { //生成 出库 流水号
+                        serialNumber = billnoSerialServiceImpl.getSerialNumber("DB", time);
+                        item.setfSerialNumber(serialNumber);
+                    }
+                }
                /* if ("RK".equals(billtystatus)) { // 生成 入库 流水号
                     serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
                     item.setfSerialNumber(serialNumber);