[CODE]: 打印作业单流水号

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

@@ -170,6 +170,35 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
     }
 
     /**
+     * 获取入库 出库 流水号
+     *
+     * @param billType 编号类型(RK（入库） CK（出库） )
+     * @param time     入库时间
+     * @return 结果
+     */
+    public String getFictitiousNumber(String billType, Date time) {
+        String billNo = null;
+        String yyMMdd = DateFormatUtils.format(time, "yyMMdd");
+        BillnoSerial billnoSerial = new BillnoSerial();
+        billnoSerial.setBillType(billType);
+        billnoSerial.setBillPrefix(yyMMdd);
+        BillnoSerial billnoSerials = billnoSerialMapper.selectBillnoSerial(billnoSerial);
+        if (StringUtils.isNotNull(billnoSerials)) {
+            if (billnoSerials.getSerial() <= 9) {
+                billNo = yyMMdd + "00" + billnoSerials.getSerial();
+            } else if (billnoSerials.getSerial() <= 99) {
+                billNo = yyMMdd + "0" + billnoSerials.getSerial();
+            } else if (billnoSerials.getSerial() <= 999) {
+                billNo = yyMMdd + "" + billnoSerials.getSerial();
+            }
+        } else {
+            billNo = yyMMdd + "001";
+        }
+        billNo = billType + billNo;
+        return billNo;
+    }
+
+    /**
      * 查询客户存货编号流水号
      *
      * @param id 客户存货编号流水号ID

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

@@ -799,12 +799,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         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);
+        // 查询流水号
+         if ("SJRK".equals(billsType)) {
+             serialNumber = billnoSerialServiceImpl.getFictitiousNumber("RK", time);
+         } else if ("SJCK".equals(billsType)) {
+             serialNumber = billnoSerialServiceImpl.getFictitiousNumber("CK", time);
+         } else if ("CKDB".equals(billsType)) {
+             serialNumber = billnoSerialServiceImpl.getFictitiousNumber("DB", time);
          }
          map.put("fSerialNumber",serialNumber);
         return AjaxResult.success("成功",map);
@@ -1293,7 +1294,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         item.setfSerialNumber(serialNumber);
                     }
                 }
-               /* if ("RK".equals(billtystatus)) { // 生成 入库 流水号
+                if ("RK".equals(billtystatus)) { // 生成 入库 流水号
                     serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
                     item.setfSerialNumber(serialNumber);
                 } else if ("CK".equals(billtystatus)) { //生成 出库 流水号
@@ -1302,7 +1303,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());