[CODE]:入库出库货转只要提交就生成业务编码；删除：业务编码取出放入billno_del

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

@@ -14,14 +14,8 @@ import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.warehouseBusiness.domain.TEnclosure;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
-import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
-import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
-import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper;
-import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
-import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper;
-import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsMapper;
+import com.ruoyi.warehouseBusiness.domain.*;
+import com.ruoyi.warehouseBusiness.mapper.*;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,6 +74,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Autowired
     private BillnoSerialServiceImpl billnoSerialServiceImpl;
 
+    @Autowired
+    private BillnoDelMapper billnoDelMapper;
+
 
     /**
      * 查询详情主表
@@ -354,7 +351,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehouseBills.setCreateBy(loginUser.getUser().getUserName());
             warehouseBills.setfBilltype(billsType);
             warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
-            // 提交时：  生流水号
+            /*// 提交时：  生流水号
             if ("6".equals(warehouseBills.getfBillstatus()) || "7".equals(warehouseBills.getfBillstatus())) {
                 // 业务编码
                 String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
@@ -363,11 +360,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 Date time = new Date();
                 String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
                 warehouseBills.setfBscorpno(bscorpno);
-            }
+            }*/
+            // 业务编码
+            String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
+            warehouseBills.setfBillno(billNo);
+            // 存货编码
+            Date time = new Date();
+            String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
+            warehouseBills.setfBscorpno(bscorpno);
             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
             fPid = warehouseBills.getfId();
         } else {
-            // 提交时：  生流水号
+            /*// 提交时：  生流水号
             if ("6".equals(warehouseBills.getfBillstatus())) {
                 // 业务编码
                 String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
@@ -376,7 +380,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 Date time = new Date();
                 String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
                 warehouseBills.setfBscorpno(bscorpno);
-            }
+            }*/
             fPid = warehouseBills.getfId();
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
@@ -537,6 +541,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fPid = tWarehouseBills.getfId();
             tEnclosureMapper.deleteByFPid(fPid);
         } else {
+            // 业务编码
+            String billNo = billnoSerialServiceImpl.getBillNo(billsType, tWarehouseBills.getfBsdate());
+            tWarehouseBills.setfBillno(billNo);
+            // 存货编码
+            Date time = new Date();
+            String bscorpno = billnoSerialServiceImpl.getCorpNo(tWarehouseBills.getfCorpid(), time);
+            tWarehouseBills.setfBscorpno(bscorpno);
             tWarehouseBills.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseBills.setCreateTime(new Date());
             tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
@@ -612,6 +623,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     public int deleteTWarehousebillsByIds(Long[] fIds) {
+        // 取出业务编号、 放入 billno_del
+        for(Long id:fIds){
+            // 1、查询主表信息
+            TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(id);
+            // 2、业务编号、客存编号 放入 billno_del
+            BillnoDel  billnoDel =new BillnoDel();
+            billnoDel.setBillType(tWarehousebills.getfBilltype());
+            billnoDel.setBillNo(tWarehousebills.getfBillno());
+            billnoDelMapper.insertBillnoDel(billnoDel);
+        }
         return tWarehouseBillsMapper.deleteTWarehousebillsByIds(fIds);
     }