Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库详情主表Controller
@@ -39,7 +40,7 @@ public class TWarehouseOutStockController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("SJCK");
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
         return getDataTable(list);
     }
 

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

@@ -337,6 +337,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
             fPid = warehouseBills.getfId();
         } else {
+            // 提交时：  生流水号
+            if ("6".equals(warehouseBills.getfBillstatus())) {
+                // 业务编码
+                String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
+                warehouseBills.setfBillno(billNo);
+                // 存货编码
+                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());