调整出入库 打印单据卸货同时保存 其他表数据

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

@@ -88,11 +88,11 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
-    public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
+    public AjaxResult add(@RequestParam("warehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tWhgenleg,
-                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
-                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
+                          @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
         String billsType = "HQZY";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
@@ -113,11 +113,11 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/warehouseSubmission")
     @RepeatSubmit
-    public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
+    public AjaxResult warehouseSubmission(@RequestParam("warehouseBills") String tWarehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
-                                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
-                                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                                          @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
+                                          @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
+                                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
         String billsType = "HQZY";
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
@@ -138,7 +138,10 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @PostMapping(value = "/addCredit")
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
-                                @RequestParam("warehousebillsitems") String warehousebillsitems ) {
+                                @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
+                                @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "HQZY";
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息，请确认");
@@ -148,7 +151,8 @@ public class TWarehouseGoodsTransferController extends BaseController {
         }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, tEnclosure, warehousebillsfeesCr,
+                warehousebillsfeesDr, loginUser, billsType);
     }
 
     /**
@@ -203,11 +207,15 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @PostMapping(value = "/updateCredit")
     @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
+                                   @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                   @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "HQZYRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
     }
 
 }

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

@@ -127,7 +127,6 @@ public class TWarehouseInStockController extends BaseController {
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
     }
 
-
     /**
      * 修改入库详情主表
      */
@@ -177,11 +176,15 @@ public class TWarehouseInStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
+                                   @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                   @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJRKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
     }
 
     /**
@@ -194,12 +197,16 @@ public class TWarehouseInStockController extends BaseController {
     @PostMapping(value = "/waitWarehousing")
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
+                                      @RequestParam("tEnclosure") String tEnclosure,
+                                      @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                      @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems
     ) {
         Long billsType = 20L;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, loginUser, billsType, "20");
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, tEnclosure,
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType, "20");
     }
 
 
@@ -212,12 +219,16 @@ public class TWarehouseInStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/ischargeCargo")
     @RepeatSubmit
-    public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String warehouseBills,
-                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
+    public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String tWarehouseBills,
+                                    @RequestParam("tEnclosure") String tEnclosure,
+                                    @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
+                                    @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
+                                    @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
         Long billsType = 30L;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems, loginUser, billsType, "1");
+        return itWarehouseBillsService.waitWarehousing(tWarehouseBills, tWarehousebillsitems, tEnclosure,
+                tWarehousebillsfeesCr, tWarehousebillsfeesDr, loginUser, billsType, "1");
     }
 
 
@@ -230,6 +241,9 @@ public class TWarehouseInStockController extends BaseController {
     @PostMapping(value = "/addCredit")
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
+                                @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                 @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJRK";
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
@@ -240,7 +254,8 @@ public class TWarehouseInStockController extends BaseController {
         }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.addCredit(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.addCredit(warehouseBills, warehousebillsitems, tEnclosure, warehousebillsfeesCr,
+                warehousebillsfeesDr, loginUser, billsType);
     }
 
 

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

@@ -65,11 +65,11 @@ public class TWarehouseOutStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/warehouseSubmission")
     @RepeatSubmit
-    public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
+    public AjaxResult warehouseSubmission(@RequestParam("warehouseBills") String tWarehouseBills,
                                           @RequestParam("tEnclosure") String tEnclosure,
-                                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
-                                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                                          @RequestParam("wfeesCr") String tWarehousebillsfeesCr,
+                                          @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
+                                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
         String billsType = "SJCK";
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
@@ -113,11 +113,11 @@ public class TWarehouseOutStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
-    public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
+    public AjaxResult add(@RequestParam("warehouseBills") String tWarehouseBills,
                           @RequestParam("tEnclosure") String tEnclosure,
-                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
-                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
+                          @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
         String billsType = "SJCK";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
@@ -184,11 +184,15 @@ public class TWarehouseOutStockController extends BaseController {
     @PostMapping(value = "/updateCredit")
     @RepeatSubmit
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
+                                   @RequestParam("tEnclosure") String tEnclosure,
+                                   @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                   @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJCKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems,
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
     }
 
     /**
@@ -201,11 +205,15 @@ public class TWarehouseOutStockController extends BaseController {
     @PostMapping(value = "/waitWarehousing")
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
+                                      @RequestParam("tEnclosure") String tEnclosure,
+                                      @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                      @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems) {
         Long billsType = 20L;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType , "70");
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType , "70");
     }
 
     /**
@@ -218,11 +226,15 @@ public class TWarehouseOutStockController extends BaseController {
     @PostMapping(value = "/ischargeCargo")
     @RepeatSubmit
     public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String warehouseBills,
-                                    @RequestParam("warehousebillsitems") String warehousebillsitems ) {
+                                    @RequestParam("tEnclosure") String tEnclosure,
+                                    @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                    @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
+                                    @RequestParam("warehousebillsitems") String warehousebillsitems) {
         Long billsType = 30L;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType,"1");
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,
+                tEnclosure, warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType,"1");
     }
 
 
@@ -235,7 +247,10 @@ public class TWarehouseOutStockController extends BaseController {
     @PostMapping(value = "/addCredit")
     @RepeatSubmit
     public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
-                                @RequestParam("warehousebillsitems") String warehousebillsitems ) {
+                                @RequestParam("tEnclosure") String tEnclosure,
+                                @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
+                                @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
+                                @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJCK";
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息，请确认");
@@ -245,7 +260,8 @@ public class TWarehouseOutStockController extends BaseController {
         }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, loginUser, billsType);
+        return itWarehouseBillsService.updateCredit(warehouseBills, warehousebillsitems, tEnclosure,
+                warehousebillsfeesCr, warehousebillsfeesDr, loginUser, billsType);
     }
 
 

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

@@ -41,11 +41,11 @@ public interface ITWarehouseBillsService {
     /**
      * 新增详情主表
      *
-     * @param tWarehouseBills      仓库主表
-     * @param tWarehousebillsfeesCr  仓库费用付款明细表
-     * @param tWarehousebillsfeesDr  仓库费用收款明细表
-     * @param tWarehousebillsitems 仓库货物明细表
-     * @param loginUser            当前登陆人
+     * @param tWarehouseBills       仓库主表
+     * @param tWarehousebillsfeesCr 仓库费用付款明细表
+     * @param tWarehousebillsfeesDr 仓库费用收款明细表
+     * @param tWarehousebillsitems  仓库货物明细表
+     * @param loginUser             当前登陆人
      * @param billsType             操作状态
      * @return 结果
      */
@@ -83,39 +83,50 @@ public interface ITWarehouseBillsService {
     String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills);
 
     /**
-     *  撤销入出库
+     * 撤销入出库
+     *
      * @param fId
      * @param loginUser
      * @param billsType
      * @return
      */
     public AjaxResult revokeTWarehousebillsById(Long fId, LoginUser loginUser, String billsType);
-    AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType);
 
-    AjaxResult addCredit(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType);
+    AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String tEnclosure,
+                                          String warehousebillsfeesCr, String warehousebillsfeesDr,
+                                          LoginUser loginUser, String billsType);
+
+    AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
+            String warehousebillsfeesDr, LoginUser loginUser, String billsType);
 
     /**
-     *   出库 、调拨、 货转 确认
+     * 出库 、调拨、 货转 确认
+     *
      * @param warehouseBills
      * @param warehousebillsitems
      * @param loginUser
      * @param billsType
      * @return
      */
-    AjaxResult updateCredit(String warehouseBills, String warehousebillsitems,  LoginUser loginUser, String billsType);
+    AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
+                            String warehousebillsfeesDr, LoginUser loginUser, String billsType);
 
     /**
-     *   入库 、 出库  修改 从表状态
+     * 入库 、 出库  修改 从表状态
+     *
      * @param warehouseBills
      * @param warehousebillsitems
      * @param loginUser
      * @param status
      * @return
      */
-    AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,  LoginUser loginUser , Long status, String billtystatus);
+    AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,
+                               String tEnclosure, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
+                               LoginUser loginUser, Long status, String billtystatus);
 
     /**
-     *  计算仓储费
+     * 计算仓储费
+     *
      * @param tWarehouseBills
      * @param loginUser
      * @param billsType
@@ -124,7 +135,8 @@ public interface ITWarehouseBillsService {
     AjaxResult calculateStorageFees(TWarehouseBills tWarehouseBills, LoginUser loginUser, String billsType);
 
     /**
-     *  仓储费计算提交以及暂存
+     * 仓储费计算提交以及暂存
+     *
      * @param warehouseBills
      * @param warehouseItems
      * @param warehouseFees
@@ -135,7 +147,8 @@ public interface ITWarehouseBillsService {
     AjaxResult insertStorageFee(String warehouseBills, String warehouseItems, String warehouseFees, LoginUser loginUser, String billsType);
 
     /**
-     *  根据id 查询仓储费计算明细
+     * 根据id 查询仓储费计算明细
+     *
      * @param fId
      * @return
      */
@@ -144,11 +157,11 @@ public interface ITWarehouseBillsService {
     /**
      * 仓库提交方法
      *
-     * @param tWarehouseBills      仓库主表
-     * @param tWarehousebillsfeesCr  仓库费用付款明细表
-     * @param tWarehousebillsfeesDr  仓库费用收款明细表
-     * @param tWarehousebillsitems 仓库货物明细表
-     * @param loginUser            当前登陆人
+     * @param tWarehouseBills       仓库主表
+     * @param tWarehousebillsfeesCr 仓库费用付款明细表
+     * @param tWarehousebillsfeesDr 仓库费用收款明细表
+     * @param tWarehousebillsitems  仓库货物明细表
+     * @param loginUser             当前登陆人
      * @param billsType             操作状态
      * @return 结果
      */

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

@@ -452,8 +452,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     }
                 }
             }
-            // 录入库存明细整体状态 --> 更新主表 入账状态
-            updateWarehousebillsItemsStatus(warehouseBills);
         }
         //  附件添加
         if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
@@ -634,11 +632,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
                 wbDr.setfPid(fPid);
                 wbDr.setfDc("D");
-                if (isApprove) {
-                    wbDr.setfBillstatus(4L);
-                } else {
-                    wbDr.setfBillstatus(6L);
-                }
+                wbDr.setfBillstatus(4L);
                 wbDr.setCreateTime(new Date());
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
@@ -731,8 +725,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     @Transactional
-    public AjaxResult addCredit(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
-        Long fPid = null;
+    public AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
+                                String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
         Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
@@ -741,12 +735,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到入账信息");
         }
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
+        tWarehouseBills.setfItemsStatus(4L);
         tWarehouseBills.setfBilltype(billsType);
         if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
             tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             tWarehouseBills.setUpdateTime(new Date());
             tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         }
+        tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
+        tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         for (TWarehousebillsitems item : warehousebillsitemsList) {
@@ -785,8 +782,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("新增库存明细失败");
             }
         }
-        // 查询所有库存明细 修改仓库主表状态
-        updateWarehousebillsItemsStatus(tWarehouseBills);
+        //  附件添加
+        if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
+            List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
+            for (TEnclosure enclosure : tEnclosureList) {
+                enclosure.setfPid(tWarehouseBills.getfId());
+                enclosure.setCreateBy(loginUser.getUser().getUserName());
+                enclosure.setCreateTime(new Date());
+                tEnclosureMapper.insertTEnclosure(enclosure);
+            }
+        }
+        // 收款明细添加
+        if (StringUtils.isNotEmpty(warehousebillsfeesDr) && !"[]".equals(warehousebillsfeesDr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(warehousebillsfeesDr);
+            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
+                wbDr.setfPid(tWarehouseBills.getfId());
+                wbDr.setfDc("D");
+                wbDr.setCreateBy(loginUser.getUser().getUserName());
+                wbDr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+            }
+        }
+        // 付款明细添加
+        if (StringUtils.isNotNull(warehousebillsfeesCr) && !"[]".equals(warehousebillsfeesCr)) {
+            JSONArray jsonCrArray = JSONArray.parseArray(warehousebillsfeesCr);
+            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
+                wbCr.setfPid(tWarehouseBills.getfId());
+                wbCr.setfDc("C");
+                wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+            }
+        }
         map.put("warehousebillsitems", warehousebillsitemsList);
         return AjaxResult.success("成功", map);
     }
@@ -802,10 +832,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     @Transactional
-    public AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
+    public AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
+                                   String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
         Long fPid = null;
         Map<String, Object> map = new HashMap<>();
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
+        tWarehouseBills.setfItemsStatus(4L);
         tWarehouseBills.setfBilltype(billsType);
         if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
             tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
@@ -821,7 +853,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.insertTWarehousebills(tWarehouseBills);
             fPid = tWarehouseBills.getfId();
         }
-        System.out.println(warehousebillsitems);
+        tEnclosureMapper.deleteByFPid(fPid);
+        tWarehousebillsfeesMapper.deleteByFPid(fPid);
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
         int i = 1;
@@ -951,8 +984,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("库存明细更新失败");
             }
         }
-        // 查询所有库存明细 修改仓库主表状态
-        updateWarehousebillsItemsStatus(tWarehouseBills);
+        //  附件添加
+        if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
+            List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
+            for (TEnclosure enclosure : tEnclosureList) {
+                enclosure.setfPid(tWarehouseBills.getfId());
+                enclosure.setCreateBy(loginUser.getUser().getUserName());
+                enclosure.setCreateTime(new Date());
+                tEnclosureMapper.insertTEnclosure(enclosure);
+            }
+        }
+        // 收款明细添加
+        if (StringUtils.isNotEmpty(warehousebillsfeesDr) && !"[]".equals(warehousebillsfeesDr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(warehousebillsfeesDr);
+            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
+                wbDr.setfPid(tWarehouseBills.getfId());
+                wbDr.setfDc("D");
+                wbDr.setCreateBy(loginUser.getUser().getUserName());
+                wbDr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+            }
+        }
+        // 付款明细添加
+        if (StringUtils.isNotNull(warehousebillsfeesCr) && !"[]".equals(warehousebillsfeesCr)) {
+            JSONArray jsonCrArray = JSONArray.parseArray(warehousebillsfeesCr);
+            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
+                wbCr.setfPid(tWarehouseBills.getfId());
+                wbCr.setfDc("C");
+                wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+            }
+        }
         map.put("fPid", fPid);
         map.put("warehouse", tWarehouseBills);
         map.put("warehouseItem", warehousebillsitemsList);
@@ -963,8 +1029,22 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
 
+    /**
+     *  打印作业单
+     * @param warehouseBills
+     * @param warehousebillsitems
+     * @param tEnclosure
+     * @param tWarehousebillsfeesCr
+     * @param tWarehousebillsfeesDr
+     * @param loginUser
+     * @param status
+     * @param billtystatus
+     * @return
+     */
     @Override
-    public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems, LoginUser loginUser, Long status, String billtystatus) {
+    public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,
+                                      String tEnclosure, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr,
+                                      LoginUser loginUser, Long status, String billtystatus) {
         Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
@@ -973,11 +1053,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到入账信息");
         }
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
+        if (status.equals(20L)) {
+            tWarehouseBills.setfItemsStatus(2L);
+        } else {
+            tWarehouseBills.setfItemsStatus(3L);
+        }
         if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
             tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             tWarehouseBills.setUpdateTime(new Date());
             tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         }
+        tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
+        tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
         List<TWarehousebillsitems> tWarehousebillsitemsList = new ArrayList<>();
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -1006,6 +1093,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             tWarehousebillsitemsList.add(item);
         }
+        //  附件添加
+        if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
+            List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
+            for (TEnclosure enclosure : tEnclosureList) {
+                enclosure.setfPid(tWarehouseBills.getfId());
+                enclosure.setCreateBy(loginUser.getUser().getUserName());
+                enclosure.setCreateTime(new Date());
+                tEnclosureMapper.insertTEnclosure(enclosure);
+            }
+        }
+        // 收款明细添加
+        if (StringUtils.isNotEmpty(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
+            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
+                wbDr.setfPid(tWarehouseBills.getfId());
+                wbDr.setfDc("D");
+                wbDr.setCreateBy(loginUser.getUser().getUserName());
+                wbDr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+            }
+        }
+        // 付款明细添加
+        if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
+            JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
+            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
+                wbCr.setfPid(tWarehouseBills.getfId());
+                wbCr.setfDc("C");
+                wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+            }
+        }
         // 添加成功 返回 前台
         map.put("warehousebillsitems", tWarehousebillsitemsList);
         return AjaxResult.success("成功", map);
@@ -1385,12 +1507,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TEnclosure enclosure = new TEnclosure();
         enclosure.setfPid(tWarehousebills.getfId());
         List<TEnclosure> enclosures = tEnclosureMapper.selectTEnclosureList(enclosure);
-        if( StringUtils.isNull(tWarehousebills)){
+        if (StringUtils.isNull(tWarehousebills)) {
             return AjaxResult.success("0");
-        } else if(StringUtils.isNotNull(tWarehousebills)
-                    && StringUtils.isEmpty(warehousebillsfees)
-                    && StringUtils.isEmpty(enclosures)
-                    && StringUtils.isEmpty(mapList) ){
+        } else if (StringUtils.isNotNull(tWarehousebills)
+                && StringUtils.isEmpty(warehousebillsfees)
+                && StringUtils.isEmpty(enclosures)
+                && StringUtils.isEmpty(mapList)) {
             return AjaxResult.success("1");
         } else {
             return AjaxResult.success("2");
@@ -1507,8 +1629,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     @Transactional
-    public AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
-        Long fPid = null;
+    public AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String tEnclosure,
+                                                 String warehousebillsfeesCr, String warehousebillsfeesDr, LoginUser loginUser, String billsType) {
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
         }
@@ -1516,9 +1638,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到入账信息");
         }
         TWarehouseBills tWarehousebills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
-        fPid = tWarehousebills.getfId();
+        tWarehousebills.setfItemsStatus(1L);
+        tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
+        tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
+        tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
+        System.out.println(warehousebillsitemsList);
         if (StringUtils.isNotEmpty(warehousebillsitemsList)) {
             int i = 1;
             for (TWarehousebillsitems wb : warehousebillsitemsList) {
@@ -1532,6 +1658,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         return AjaxResult.error("第" + i + "行撤销数大于库存结余数");
                     }
                 } else if ("SJCKRevoke".equals(billsType)) { // 撤销出库
+                    System.out.println("第" + i + "条数主表的类型" + billsType);
+                    System.out.println("第" + i + "条数库存总账的：" + tWhgenle.toString());
+
                     if (StringUtils.isNotNull(tWhgenle)) { // 非空
                         updateTWhgenlegData(wb, tWhgenle.getfId(), billsType);
                     } else {
@@ -1585,39 +1714,42 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
             }
         }
-        updateWarehousebillsItemsStatus(tWarehousebills);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 主表、库存明细表 更新 入账状态
-     */
-    public void updateWarehousebillsItemsStatus(TWarehouseBills warehouseBill) {
-        // 查询所有库存明细 修改仓库主表状态
-        int notInStorage = 0;
-        int Stored = 0;
-        TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
-        tWarehousebillsitems.setfPid(warehouseBill.getfId());
-        List<TWarehousebillsitems> warehousebillsitemsList1 = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
-        for (TWarehousebillsitems item : warehousebillsitemsList1) {
-            if (item.getfBillstatus().equals(40L)) {
-                Stored++;
-            } else {
-                notInStorage++;
+        //  附件添加
+        if (StringUtils.isNotEmpty(tEnclosure) && !"[]".equals(tEnclosure)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
+            List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
+            for (TEnclosure enclosure : tEnclosureList) {
+                enclosure.setfPid(tWarehousebills.getfId());
+                enclosure.setCreateBy(loginUser.getUser().getUserName());
+                enclosure.setCreateTime(new Date());
+                tEnclosureMapper.insertTEnclosure(enclosure);
             }
         }
-
-        // 录入库存明细整体状态
-        TWarehouseBills warehouseBill1 = new TWarehouseBills();
-        warehouseBill1.setfId(warehouseBill.getfId());
-        if (Objects.equals(Stored, 0)) { // 未入库
-            warehouseBill1.setfItemsStatus(1L);
-        } else if (Objects.equals(notInStorage, 0)) { // 已入库
-            warehouseBill1.setfItemsStatus(6L);
-        } else { // 有已入库、有未入库
-            warehouseBill1.setfItemsStatus(2L);
+        // 收款明细添加
+        if (StringUtils.isNotEmpty(warehousebillsfeesDr) && !"[]".equals(warehousebillsfeesDr)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(warehousebillsfeesDr);
+            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
+                wbDr.setfPid(tWarehousebills.getfId());
+                wbDr.setfDc("D");
+                wbDr.setCreateBy(loginUser.getUser().getUserName());
+                wbDr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+            }
+        }
+        // 付款明细添加
+        if (StringUtils.isNotNull(warehousebillsfeesCr) && !"[]".equals(warehousebillsfeesCr)) {
+            JSONArray jsonCrArray = JSONArray.parseArray(warehousebillsfeesCr);
+            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
+            for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
+                wbCr.setfPid(tWarehousebills.getfId());
+                wbCr.setfDc("C");
+                wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setCreateTime(new Date());
+                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+            }
         }
-        tWarehouseBillsMapper.updateTWarehousebills(warehouseBill1);
+        return AjaxResult.success();
     }
 
     /**