[CODE]:出库状态 字段值

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

@@ -158,7 +158,7 @@ public class TWarehouseInStockController extends BaseController {
         String billsType = "20";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType);
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType,"20");
     }
 
 
@@ -176,7 +176,7 @@ public class TWarehouseInStockController extends BaseController {
         String billsType = "30";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType);
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType,null);
     }
 
 

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

@@ -161,7 +161,7 @@ public class TWarehouseOutStockController extends BaseController {
 
     /**
      *  打印作业单  状态 改为 -->  待出库
-     *      生成 流水号 --> log 记录 70
+     *      生成 流水号 --> log 记录 20
      *      waitWarehousing
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
@@ -170,15 +170,15 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult waitWarehousing(@RequestParam("warehouseBills") String warehouseBills,
                                       @RequestParam("warehousebillsitems") String warehousebillsitems) {
-        String billsType = "70";
+        String billsType = "20";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType);
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType , "70");
     }
 
     /**
      *   装货      状态 改为 -->  装货中
-     *                   log 记录 80
+     *                   log 记录 30
      *      ischargeCargo
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
@@ -187,16 +187,16 @@ public class TWarehouseOutStockController extends BaseController {
     @RepeatSubmit
     public AjaxResult ischargeCargo(@RequestParam("warehouseBills") String warehouseBills,
                                     @RequestParam("warehousebillsitems") String warehousebillsitems ) {
-        String billsType = "80";
+        String billsType = "30";
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType);
+        return itWarehouseBillsService.waitWarehousing(warehouseBills, warehousebillsitems,  loginUser, billsType,null);
     }
 
 
     /**
      *   出库确认   状态 改为 -->  已出库
-     *                   log 记录 90
+     *                   log 记录 40
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)

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

@@ -111,5 +111,5 @@ public interface ITWarehouseBillsService {
      * @param status
      * @return
      */
-    AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,  LoginUser loginUser , String status );
+    AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems,  LoginUser loginUser , String status ,String billtystatus );
 }

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

@@ -403,18 +403,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     wbItem.setfPid(fPid);
                     wbItem.setCreateBy(loginUser.getUser().getUserName());
                     wbItem.setCreateTime(new Date());
-                    Long status = null;
-                    if (billsType.equals("SJRK")){
-                        wbItem.setfBillstatus("10");
-                        status=10l;
-                    } else if(billsType.equals("SJCK")){
-                        wbItem.setfBillstatus("60");
-                        status=60l;
-                    }
+                    wbItem.setfBillstatus("10");
                     tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
                     if(!billsType.equals("HQZY")){
                         // 添加状态log
-                        insertTWarehousebillsLog(wbItem, status,loginUser);
+                        insertTWarehousebillsLog(wbItem, 10l,loginUser);
                     }
                 }
             }
@@ -476,6 +469,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Transactional
     public AjaxResult addCredit(String warehouseBills, String warehousebillsitems,  LoginUser loginUser, String billsType) {
         Long fPid = null;
+        Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
         }
@@ -522,8 +516,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         // 查询所有库存明细 修改仓库主表状态
         updateWarehousebillsItemsStatus(tWarehouseBills);
-        // 添加成功 主键返回 前台
-        return AjaxResult.success(warehousebillsitems);
+        map.put("warehousebillsitems", warehousebillsitemsList);
+        return AjaxResult.success("成功", map);
     }
 
     /**
@@ -679,7 +673,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
 
     @Override
-    public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String status) {
+    public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String status,String billtystatus) {
+        Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
             return AjaxResult.error("未找到主表信息");
         }
@@ -698,10 +693,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 生成流水号
             Date time = new Date();
             String serialNumber;
-            if(status.equals("20")){ // 生成 入库 流水号
+            if(billtystatus.equals("20")){ // 生成 入库 流水号
                  serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
                  item.setfSerialNumber(serialNumber);
-            } else if (status.equals("70")){ //生成 出库 流水号
+            } else if (billtystatus.equals("70")){ //生成 出库 流水号
                  serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
                  item.setfSerialNumber(serialNumber);
             }
@@ -721,20 +716,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 item.setCreateBy(loginUser.getUser().getUserName());
                 num = tWarehousebillsitemsMapper.insertTWarehousebillsitems(item);
                 // 添加状态log
-                if(status.equals("20")){
-                    insertTWarehousebillsLog(item,10L,loginUser);
-                } else if(status.equals("70")){
-                    insertTWarehousebillsLog(item,60L,loginUser);
-                }
+                insertTWarehousebillsLog(item,10L,loginUser);
                 insertTWarehousebillsLog(item,Long.parseLong(status),loginUser);
             }
             if (num <= 0) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("更新库存明细失败");
             }
+            map.put("warehousebillsitems", item);
         }
-        // 返回从表数据明细
-        return AjaxResult.success(warehousebillsitems);
+        // 添加成功 返回 前台
+        return AjaxResult.success("成功", map);
     }
 
     // 入库 收费明细 校验