优化 入库确认接口，修改出库确认 调取仓储费协议求得收款信息

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

@@ -167,7 +167,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         String billsType = "HQZYRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, whgenleg, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
     }
 
 }

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

@@ -148,11 +148,10 @@ public class TWarehouseInStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
-                                @RequestParam("warehousebillsitems") String warehousebillsitems,
-                                @RequestParam("whgenleg") String whgenleg) {
+                                @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJRKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, whgenleg, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
     }
 }

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

@@ -165,11 +165,10 @@ public class TWarehouseOutStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping(value = "/updateCredit")
     public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
-                                   @RequestParam("warehousebillsitems") String warehousebillsitems,
-                                   @RequestParam("whgenleg") String whgenleg) {
+                                   @RequestParam("warehousebillsitems") String warehousebillsitems) {
         String billsType = "SJCKRevoke";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, whgenleg, loginUser, billsType);
+        return itWarehouseBillsService.revokeTWarehousebillsById1(warehouseBills, warehousebillsitems, loginUser, billsType);
     }
 }

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

@@ -88,7 +88,7 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult revokeTWarehousebillsById(Long fId, LoginUser loginUser, String billsType);
-    AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String whgenleg, LoginUser loginUser, String billsType);
+    AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType);
 
     AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String whgenleg, LoginUser loginUser, String billsType);
 

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

@@ -984,14 +984,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      *
      * @param warehouseBills      主表
      * @param warehousebillsitems 明细
-     * @param whgenleg            附件
      * @param loginUser           当前登录人
      * @param billsType           状态
      * @return 结果
      */
     @Override
     @Transactional
-    public AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, String whgenleg, LoginUser loginUser, String billsType) {
+    public AjaxResult revokeTWarehousebillsById1(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
         Long fPid = null;
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
@@ -1060,6 +1059,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     updateTWhgenlegData(wb, tWhgenle2.getfId(), "SJCKRevoke");
                 }
                 i++;
+                wb.setfBillstatus("1");
+                wb.setUpdateBy(loginUser.getUser().getUserName());
+                wb.setUpdateTime(new Date());
+                if (tWarehousebillsitemsMapper.updateTWarehousebillsitems(wb) <= 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("新增库存明细失败");
+                }
             }
         }
         // 查询所有库存明细 修改仓库主表状态