安品业务编号生成规则修改

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

@@ -59,14 +59,16 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
                 billnoSerials.setSerial(billnoSerials.getSerial() + 1);
                 billnoSerialMapper.updateBillnoSerial(billnoSerials);
                 if (billnoSerials.getSerial() <= 9) {
-                    billNo = yyyyMM + "00" + billnoSerials.getSerial();
+                    billNo = yyyyMM + "000" + billnoSerials.getSerial();
                 } else if (billnoSerials.getSerial() <= 99) {
-                    billNo = yyyyMM + "0" + billnoSerials.getSerial();
+                    billNo = yyyyMM + "00" + billnoSerials.getSerial();
                 } else if (billnoSerials.getSerial() <= 999) {
+                    billNo = yyyyMM + "0" + billnoSerials.getSerial();
+                }else {
                     billNo = yyyyMM + "" + billnoSerials.getSerial();
                 }
             } else {
-                billNo = yyyyMM + "001";
+                billNo = yyyyMM + "0001";
                 billnoSerial.setSerial(1);
                 billnoSerialMapper.insertBillnoSerial(billnoSerial);
             }

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

@@ -4025,10 +4025,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             if (CollectionUtils.isNotEmpty(tWarehousebillsfeesList)){
                 for (TWarehousebillsfees warehousebillsfees : tWarehousebillsfeesList) {
                     TWhgenleg tWhgenleg = this.anPinQueryTWhgenleg(tWarehousebills, warehousebillsfees);
-                    Integer updateTWhgenlegData = this.anPinUpdateTWhgenlegData(warehousebillsfees, tWhgenleg.getfId(), billsType);
-                    if (updateTWhgenlegData == null || updateTWhgenlegData > 1){
+                    if (tWhgenleg == null){
+                        continue;
+                    }
+                    int updateTWhgenlegData = this.anPinUpdateTWhgenlegData(warehousebillsfees, tWhgenleg.getfId(), billsType);
+                    if (updateTWhgenlegData < 1){
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("撤销失败,撤销库存总账失败，请找管理员.");
+                        return AjaxResult.error("撤销失败,撤销库存总账失败!");
                     }
                 }
             }