添加出库入库，箱型箱量

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TCntrController.java

@@ -40,7 +40,6 @@ public class TCntrController extends BaseController
     /**
      * 查询集装箱列表
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntr:list')")
     @GetMapping("/list")
     public TableDataInfo list(TCntr tCntr)
     {

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

@@ -92,6 +92,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult add(@RequestParam("warehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tWhgenleg,
+                          @RequestParam("tCntr") String tCntr,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("warehousebillsitems") String tWarehousebillsitems,
@@ -114,7 +115,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, tCntr, billsType);
     }
 
     /**
@@ -126,6 +127,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult warehouseSubmission(@RequestParam("warehouseBills") String tWarehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tCntr") String tCntr,
                                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
                                           @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
@@ -138,7 +140,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -150,6 +152,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
                                 @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("tCntr") String tCntr,
                                 @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                 @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -163,7 +166,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, tEnclosure, warehousebillsfeesCr,
-                warehousebillsfeesDr, loginUser, billsType);
+                warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**
@@ -227,6 +230,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
                                    @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("tCntr") String tCntr,
                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -234,7 +238,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
 }

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

@@ -58,7 +58,6 @@ public class TWarehouseInStockController extends BaseController {
         return getDataTable(list);
     }
 
-
     /**
      * 导出入库详情主表列表
      */
@@ -92,6 +91,7 @@ public class TWarehouseInStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tEnclosure,
+                          @RequestParam("tCntr") String tCntr,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems,
@@ -110,7 +110,7 @@ public class TWarehouseInStockController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -122,6 +122,7 @@ public class TWarehouseInStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tCntr") String tCntr,
                                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
@@ -134,7 +135,7 @@ public class TWarehouseInStockController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -196,6 +197,7 @@ public class TWarehouseInStockController extends BaseController {
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
                                    @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("tCntr") String tCntr,
                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -203,7 +205,7 @@ public class TWarehouseInStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**
@@ -217,6 +219,7 @@ public class TWarehouseInStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
                                       @RequestParam("tEnclosure") String tEnclosure,
+                                      @RequestParam("tCntr") String tCntr,
                                       @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                       @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems
@@ -225,7 +228,7 @@ public class TWarehouseInStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, tEnclosure,
-                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType, "RK");
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType, "RK");
     }
 
 
@@ -240,6 +243,7 @@ public class TWarehouseInStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String tWarehouseBills,
                                     @RequestParam("tEnclosure") String tEnclosure,
+                                    @RequestParam("tCntr") String tCntr,
                                     @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                                     @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
                                     @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
@@ -247,7 +251,7 @@ public class TWarehouseInStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(tWarehouseBills, tWarehousebillsitems, tEnclosure,
-                tWarehousebillsfeesCr, tWarehousebillsfeesDr, loginUser, billsType, "1");
+                tWarehousebillsfeesCr, tWarehousebillsfeesDr, loginUser, tCntr, billsType, "1");
     }
 
 
@@ -261,6 +265,7 @@ public class TWarehouseInStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
                                 @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("tCntr") String tCntr,
                                 @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                 @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -274,10 +279,9 @@ public class TWarehouseInStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.addCredit(warehouseBills, warehousebillsitems, tEnclosure, warehousebillsfeesCr,
-                warehousebillsfeesDr, loginUser, billsType);
+                warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
-
     /**
      *   明細流水号
      */

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

@@ -49,8 +49,6 @@ public class TWarehouseOutStockController extends BaseController {
         return getDataTable(list);
     }
 
-
-
     /**
      * 查询出库详情主表列表
      */
@@ -69,6 +67,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult warehouseSubmission(@RequestParam("warehouseBills") String tWarehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tCntr") String tCntr,
                                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
                                           @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
@@ -81,7 +80,7 @@ public class TWarehouseOutStockController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -117,6 +116,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult add(@RequestParam("warehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tEnclosure,
+                          @RequestParam("tCntr") String tCntr,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("warehousebillsitems") String tWarehousebillsitems,
@@ -136,7 +136,7 @@ public class TWarehouseOutStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
-                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
 
@@ -217,6 +217,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
                                    @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("tCntr") String tCntr,
                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -224,7 +225,7 @@ public class TWarehouseOutStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**
@@ -238,6 +239,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
                                       @RequestParam("tEnclosure") String tEnclosure,
+                                      @RequestParam("tCntr") String tCntr,
                                       @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                       @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -245,7 +247,7 @@ public class TWarehouseOutStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType , "CK");
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType , "CK");
     }
 
     /**
@@ -259,6 +261,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String warehouseBills,
                                     @RequestParam("tEnclosure") String tEnclosure,
+                                    @RequestParam("tCntr") String tCntr,
                                     @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                     @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                     @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -266,7 +269,7 @@ public class TWarehouseOutStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType,"1");
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType,"1");
     }
 
 
@@ -280,6 +283,7 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
                                 @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("tCntr") String tCntr,
                                 @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                 @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -293,7 +297,7 @@ public class TWarehouseOutStockController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, tEnclosure,
-                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**

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

@@ -103,6 +103,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult add(@RequestParam("warehouseBills") String warehouseBills,
                           @RequestParam("tEnclosure") String tEnclosure,
+                          @RequestParam("tCntr") String tCntr,
                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                           @RequestParam("warehousebillsitems") String warehousebillsitems,
@@ -127,7 +128,7 @@ public class TWarehouseStockTransferController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(warehouseBills, warehousebillsfeesCr,
-                warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, billsType);
+                warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -141,6 +142,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
                                       @RequestParam("tEnclosure") String tEnclosure,
+                                      @RequestParam("tCntr") String tCntr,
                                       @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                       @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems,
@@ -156,7 +158,7 @@ public class TWarehouseStockTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, tEnclosure,
-                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType, billtystatus);
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType, billtystatus);
     }
 
     /**
@@ -170,6 +172,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String warehouseBills,
                                     @RequestParam("tEnclosure") String tEnclosure,
+                                    @RequestParam("tCntr") String tCntr,
                                     @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                     @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                     @RequestParam("warehousebillsitems") String warehousebillsitems) {
@@ -177,7 +180,7 @@ public class TWarehouseStockTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType,"1");
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType,"1");
     }
 
     /**
@@ -189,6 +192,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult warehouseSubmission(@RequestParam("warehouseBills") String warehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tCntr") String tCntr,
                                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                           @RequestParam("warehousebillsitems") String warehousebillsitems,
@@ -207,7 +211,7 @@ public class TWarehouseStockTransferController extends BaseController {
         }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(warehouseBills, warehousebillsfeesCr,
-                warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, billsType);
+                warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
     }
 
     /**
@@ -283,6 +287,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
                                    @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("tCntr") String tCntr,
                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems,
@@ -296,7 +301,7 @@ public class TWarehouseStockTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
-                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**
@@ -308,6 +313,7 @@ public class TWarehouseStockTransferController extends BaseController {
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
                                 @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("tCntr") String tCntr,
                                 @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                                 @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems,
@@ -327,7 +333,7 @@ public class TWarehouseStockTransferController extends BaseController {
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, tEnclosure, warehousebillsfeesCr,
-                warehousebillsfeesDr, loginUser, billsType);
+                warehousebillsfeesDr, loginUser, tCntr, billsType);
     }
 
     /**

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

@@ -61,7 +61,7 @@ public interface ITWarehouseBillsService {
      * @return 结果
      */
     public AjaxResult insertTWarehousebills(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
-                                            String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType);
+                                            String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String tCntr, String billsType);
 
     /**
      * 新增仓库主(出入库)
@@ -152,10 +152,10 @@ public interface ITWarehouseBillsService {
 
     AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String tEnclosure,
                                           String warehousebillsfeesCr, String warehousebillsfeesDr,
-                                          LoginUser loginUser, String billsType);
+                                          LoginUser loginUser, String tCntr, String billsType);
 
     AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
-            String warehousebillsfeesDr, LoginUser loginUser, String billsType);
+            String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType);
 
     /**
      * 出库 、调拨、 货转 确认
@@ -167,7 +167,7 @@ public interface ITWarehouseBillsService {
      * @return
      */
     AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
-                            String warehousebillsfeesDr, LoginUser loginUser, String billsType);
+                            String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType);
 
     /**
      * 入库 、 出库  修改 从表状态
@@ -180,7 +180,7 @@ public interface ITWarehouseBillsService {
      */
     AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,
                                String tEnclosure, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
-                               LoginUser loginUser, Long status, String billtystatus);
+                               LoginUser loginUser,  String tCntr, Long status, String billtystatus);
 
     /**
      * 计算仓储费
@@ -223,7 +223,7 @@ public interface ITWarehouseBillsService {
      * @param billsType             操作状态
      * @return 结果
      */
-    AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr, String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType);
+    AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr, String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String tCntr, String billsType);
 
     /**
      *  导出计算明细

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

@@ -482,7 +482,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult insertTWarehousebills(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr
-            , String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType) {
+            , String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String tCntr, String billsType) {
         Long fPid = null;
         Map<String, Object> map = new HashMap<>();
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
@@ -513,6 +513,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
+            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
             tWarehousebillsfeesMapper.deleteByFPid(fPid);
             tEnclosureMapper.deleteByFPid(fPid);
@@ -570,6 +571,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tEnclosureMapper.insertTEnclosure(enclosure);
             }
         }
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int line = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                line++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                }
+                cntr.setfPid(fPid);
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         // 收款明细添加
         if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
@@ -954,7 +975,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
-                                          String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType) {
+                                          String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String tCntr, String billsType) {
         Long fPid = null;
         boolean isApprove = false;
         String key = "";
@@ -1022,6 +1043,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsfeesMapper.deleteByFPid(fPid);
             tWarehousebillsitemsMapper.deleteByFPid(fPid);
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
         }
         JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -1066,6 +1088,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             wbItem.setCreateBy(loginUser.getUser().getUserName());
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
         }
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int cntrLine = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                cntrLine++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+cntrLine+"行数据缺少必填数据");
+                }
+                cntr.setfPid(fPid);
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
@@ -1986,11 +2028,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
-     * 叫车进场
-     *
-     * @param item    明细数据
-     * @param attachs 附件
-     * @return 结果
+     *  叫车进场
+     * @param item      明细数据
+     * @param attachs   附件
+     * @return  结果
      */
     @Override
     @Transactional
@@ -2156,7 +2197,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
-                                String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
+                                String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType) {
         Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
@@ -2172,6 +2213,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
         tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
+        tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehouseBills.getfId());
         boolean businessStatus = "场地直装".equals(tWarehouseBills.getfBusinessType());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -2228,6 +2270,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             i++;
         }
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int line = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                line++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                }
+                cntr.setfPid(tWarehouseBills.getfId());
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         //  附件添加
         if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
@@ -2285,7 +2347,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
-                                   String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
+                                   String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType) {
         Long fPid = null;
         Map<String, Object> map = new HashMap<>();
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
@@ -2306,6 +2368,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         tEnclosureMapper.deleteByFPid(fPid);
         tWarehousebillsfeesMapper.deleteByFPid(fPid);
+        tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         int i = 1;
@@ -2454,6 +2517,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("库存明细更新失败");
             }
         }
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int line = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                line++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                }
+                cntr.setfPid(tWarehouseBills.getfId());
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         //  附件添加
         if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
@@ -2516,7 +2599,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Transactional
     public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,
                                       String tEnclosure, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
-                                      LoginUser loginUser, Long status, String billtystatus) {
+                                      LoginUser loginUser, String tCntr, Long status, String billtystatus) {
         Map<String, Object> map = new HashMap<>();
         List<TWarehousebillsitems> mapList = new ArrayList<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
@@ -2538,6 +2621,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
         tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
+        tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehouseBills.getfId());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         /**
@@ -2583,6 +2667,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             mapList.add(item);
             i++;
         }
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int line = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                line++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                }
+                cntr.setfPid(tWarehouseBills.getfId());
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         //  附件添加
         if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
@@ -3200,7 +3304,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String tEnclosure,
-                                                 String warehousebillsfeesCr, String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
+                                                 String warehousebillsfeesCr, String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType) {
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
         }
@@ -3330,6 +3434,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             billnoDel.setBillNo(item);
             billnoDelMapper.insertBillnoDel(billnoDel);
         });
+        //  箱型数据
+        if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsCntr.class);
+            int line = 0;
+            for (TWarehousebillsCntr cntr : tWarehousebillsCntrs) {
+                line++;
+                if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                }
+                cntr.setfPid(tWarehousebills.getfId());
+                cntr.setfGoodsid(0L);
+                cntr.setfPackageid("0");
+                cntr.setfCntrweight(0L);
+                cntr.setCreateBy(loginUser.getUser().getUserName());
+                cntr.setCreateTime(new Date());
+                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+            }
+        }
         //  附件添加
         if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);