补料发料收料任务 新增字段入库库存状态出库库存状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@@ -166,11 +166,15 @@ public class IssueJobMainController {
         if(result==null) {
             return success(result);
         };
-        IssueJobDetailExportReqVO issueJobDetailExportReqVO = new IssueJobDetailExportReqVO();
+//        IssueJobDetailExportReqVO issueJobDetailExportReqVO = new IssueJobDetailExportReqVO();
-        issueJobDetailExportReqVO.setMasterId(result.getId());
+//        issueJobDetailExportReqVO.setMasterId(result.getId());
-        List<IssueJobDetailDO> issueJobDetailList = issueJobDetailService.getIssueJobDetailList(issueJobDetailExportReqVO);
+//        List<IssueJobDetailDO> issueJobDetailList = issueJobDetailService.getIssueJobDetailList(issueJobDetailExportReqVO);
-        List<IssueJobDetailExcelVO> issueJobDetailExcelVOS = IssueJobDetailConvert.INSTANCE.convertList02(issueJobDetailList);
+//        List<IssueJobDetailExcelVO> issueJobDetailExcelVOS = IssueJobDetailConvert.INSTANCE.convertList02(issueJobDetailList);
-        result.setSubList(issueJobDetailExcelVOS);
+//        result.setSubList(issueJobDetailExcelVOS);
+
+        List<IssueJobDetailDO> subList = issueJobDetailService.selectList(id);
+        result.setSubList(subList);
+
         return success(result);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailUpdateReqVO.java

@@ -14,5 +14,5 @@ import java.util.Map;
 public class IssueJobDetailUpdateReqVO extends IssueJobDetailBaseVO {
 
     @Schema(description = "子表记录数据")
-    private List<Map<String,Object>> recordLst;
+    private List<Map<String,String>> recordList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java

@@ -144,4 +144,12 @@ public class IssueJobMainBaseVO {
     @Schema(description = "允许修改批次")
     private String allowModifyBatch;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java

@@ -136,4 +136,10 @@ public class IssueJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改批次")
     private String allowModifyBatch;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java

@@ -11,6 +11,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.productionreceiptJob.vo.*;
 import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert;
 import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -185,11 +186,15 @@ public class ProductionreceiptJobMainController {
         if(result==null) {
             return success(result);
         };
-        ProductionreceiptJobDetailExportReqVO productionreceiptJobDetailExportReqVO = new ProductionreceiptJobDetailExportReqVO();
+//        ProductionreceiptJobDetailExportReqVO productionreceiptJobDetailExportReqVO = new ProductionreceiptJobDetailExportReqVO();
-        productionreceiptJobDetailExportReqVO.setMasterId(result.getId());
+//        productionreceiptJobDetailExportReqVO.setMasterId(result.getId());
-        List<ProductionreceiptJobDetailDO> productionreceiptJobDetailList = productionreceiptJobDetailService.getProductionreceiptJobDetailList(productionreceiptJobDetailExportReqVO);
+//        List<ProductionreceiptJobDetailDO> productionreceiptJobDetailList = productionreceiptJobDetailService.getProductionreceiptJobDetailList(productionreceiptJobDetailExportReqVO);
-        List<ProductionreceiptJobDetailExcelVO> productionreceiptJobDetailExcelVOS = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(productionreceiptJobDetailList);
+//        List<ProductionreceiptJobDetailExcelVO> productionreceiptJobDetailExcelVOS = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(productionreceiptJobDetailList);
-        result.setSubList(productionreceiptJobDetailExcelVOS);
+//        result.setSubList(productionreceiptJobDetailExcelVOS);
+
+        List<ProductionreceiptJobDetailDO> subList = productionreceiptJobDetailService.selectList(id);
+        result.setSubList(subList);
+
         return success(result);
     }
 
@@ -208,7 +213,7 @@ public class ProductionreceiptJobMainController {
         return success(countByStatus);
     }
 
-    @GetMapping(value = "/accept")
+    @PutMapping(value = "/accept")
     @Operation(summary = "承接任务")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:accept')")
     public CommonResult<Boolean> acceptProductionreceiptJobMain(@RequestParam("id") Long id) {
@@ -216,7 +221,7 @@ public class ProductionreceiptJobMainController {
         return success(result > 0);
     }
 
-    @GetMapping(value = "/abandon")
+    @PutMapping(value = "/abandon")
     @Operation(summary = "放弃任务")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:abandon')")
     public CommonResult<Boolean> abandonProductionreceiptJobMain(@RequestParam("id") Long id) {
@@ -224,7 +229,7 @@ public class ProductionreceiptJobMainController {
         return success(result > 0);
     }
 
-    @GetMapping(value = "/close")
+    @PutMapping(value = "/close")
     @Operation(summary = "关闭任务")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:close')")
     public CommonResult<Boolean> closeProductionreceiptJobMain(@RequestParam("id") Long id) {
@@ -235,8 +240,8 @@ public class ProductionreceiptJobMainController {
     @PutMapping("/execute")
     @Operation(summary = "执行任务")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:execute')")
-    public CommonResult<Boolean> executeProductionreceiptJobMain(@Valid @RequestBody ProductionreceiptJobMainUpdateReqVO updateReqVO) {
+    public CommonResult<String> executeProductionreceiptJobMain(@Valid @RequestBody ProductionreceiptJobMainUpdateReqVO updateReqVO) {
-        Integer count = productionreceiptJobMainService.executeProductionreceiptJobMain(updateReqVO);
+        String number = productionreceiptJobMainService.executeProductionreceiptJobMain(updateReqVO);
-        return success(count > 0);
+        return success(number);
     }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java

@@ -147,4 +147,10 @@ public class ProductionreceiptJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainPageReqVO.java

@@ -137,4 +137,10 @@ public class ProductionreceiptJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java

@@ -44,8 +44,8 @@ public class ProductionreturnRequestDetailController {
     @PostMapping("/create")
     @Operation(summary = "创建生产退料申请子")
     @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:create')")
-    public CommonResult<Long> createProductionreturnRequestDetail(@Valid @RequestBody ProductionreturnRequestDetailCreateReqVO createReqVO, @RequestBody RequestsettingDO requestsettingDO) {
+    public CommonResult<Long> createProductionreturnRequestDetail(@Valid @RequestBody ProductionreturnRequestDetailCreateReqVO createReqVO) {
-        return success(productionreturnRequestDetailService.createProductionreturnRequestDetail(createReqVO,requestsettingDO));
+        return success(productionreturnRequestDetailService.createProductionreturnRequestDetail(createReqVO));
     }
 
     @PutMapping("/update")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java

@@ -56,15 +56,15 @@ public class ProductionreturnRequestMainController {
     @PostMapping("/create")
     @Operation(summary = "创建生产退料申请主")
     @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:create')")
-    public CommonResult<Long> createProductionreturnRequestMain(@Valid @RequestBody ProductionreturnRequestMainCreateReqVO createReqVO,@RequestBody BusinesstypeDO businesstypeDO,@RequestBody RequestsettingDO requestsettingDO) {
+    public CommonResult<Long> createProductionreturnRequestMain(@Valid @RequestBody ProductionreturnRequestMainCreateReqVO createReqVO) {
-        return success(productionreturnRequestMainService.createProductionreturnRequestMain(createReqVO,businesstypeDO,requestsettingDO));
+        return success(productionreturnRequestMainService.createProductionreturnRequestMain(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新生产退料申请主")
     @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:update')")
-    public CommonResult<Boolean> updateProductionreturnRequestMain(@Valid @RequestBody ProductionreturnRequestMainUpdateReqVO updateReqVO,@RequestBody BusinesstypeDO businesstypeDO,@RequestBody RequestsettingDO requestsettingDO) {
+    public CommonResult<Boolean> updateProductionreturnRequestMain(@Valid @RequestBody ProductionreturnRequestMainUpdateReqVO updateReqVO) {
-        productionreturnRequestMainService.updateProductionreturnRequestMain(updateReqVO,businesstypeDO,requestsettingDO);
+        productionreturnRequestMainService.updateProductionreturnRequestMain(updateReqVO);
         return success(true);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainCreateReqVO.java

@@ -13,6 +13,8 @@ import java.util.List;
 @ToString(callSuper = true)
 public class ProductionreturnRequestMainCreateReqVO extends ProductionreturnRequestMainBaseVO {
 
+    @Schema(description = "是否合格退料")
+    private Boolean isOK;
 
     @SubObject
     @Schema(description = "子表数据")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java

@@ -5,6 +5,7 @@ import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.convert.repleinshJob.RepleinshJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.repleinshJob.RepleinshJobDetailService;
@@ -183,9 +184,9 @@ public class RepleinshJobMainController {
     @PutMapping("/execute")
     @Operation(summary = "执行任务")
     @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:execute')")
-    public CommonResult<Boolean> executeRepleinshJobMain(@Valid @RequestBody RepleinshJobMainUpdateReqVO updateReqVO) {
+    public CommonResult<String> executeRepleinshJobMain(@Valid @RequestBody RepleinshJobMainUpdateReqVO updateReqVO) {
-        Integer count = repleinshJobMainService.executeRepleinshJobMain(updateReqVO);
+        String number = repleinshJobMainService.executeRepleinshJobMain(updateReqVO);
-        return success(count > 0);
+        return success(number);
     }
 
 
@@ -199,11 +200,15 @@ public class RepleinshJobMainController {
         if(result==null) {
             return success(result);
         };
-        RepleinshJobDetailExportReqVO repleinshJobDetailExportReqVO = new RepleinshJobDetailExportReqVO();
+//        RepleinshJobDetailExportReqVO repleinshJobDetailExportReqVO = new RepleinshJobDetailExportReqVO();
-        repleinshJobDetailExportReqVO.setMasterId(result.getId());
+//        repleinshJobDetailExportReqVO.setMasterId(result.getId());
-        List<RepleinshJobDetailDO> repleinshJobDetailList = repleinshJobDetailService.getRepleinshJobDetailList(repleinshJobDetailExportReqVO);
+//        List<RepleinshJobDetailDO> repleinshJobDetailList = repleinshJobDetailService.getRepleinshJobDetailList(repleinshJobDetailExportReqVO);
-        List<RepleinshJobDetailExcelVO> repleinshJobDetailExcelVOS = RepleinshJobDetailConvert.INSTANCE.convertList02(repleinshJobDetailList);
+//        List<RepleinshJobDetailExcelVO> repleinshJobDetailExcelVOS = RepleinshJobDetailConvert.INSTANCE.convertList02(repleinshJobDetailList);
-        result.setSubList(repleinshJobDetailExcelVOS);
+//        result.setSubList(repleinshJobDetailExcelVOS);
+
+        List<RepleinshJobDetailDO> subList = repleinshJobDetailService.selectList(id);
+        result.setSubList(subList);
+
         return success(result);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailUpdateReqVO.java

@@ -12,5 +12,5 @@ import java.util.Map;
 @ToString(callSuper = true)
 public class RepleinshJobDetailUpdateReqVO extends RepleinshJobDetailBaseVO {
     @Schema(description = "子表记录数据")
-    private List<Map<String,Object>> recordLst;
+    private List<Map<String,String>> recordList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainBaseVO.java

@@ -140,4 +140,10 @@ public class RepleinshJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java

@@ -133,4 +133,10 @@ public class RepleinshJobMainPageReqVO extends PageParam {
     @Schema(description = "任务状态数组列表")
     private List Types;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java

@@ -219,5 +219,13 @@ public class IssueJobMainDO extends BaseDO {
      * 允许修改批次
      */
     private String allowModifyBatch;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java

@@ -137,5 +137,14 @@ public class IssueRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
+
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobMainDO.java

@@ -213,5 +213,13 @@ public class ProductionreceiptJobMainDO extends BaseDO {
      * 允许修改箱码
      */
     private String allowModifyPackingNumber;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobMainDO.java

@@ -224,4 +224,13 @@ public class RepleinshJobMainDO extends BaseDO {
      */
     private String allowModifyPackingNumber;
 
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestMainDO.java

@@ -126,5 +126,13 @@ public class RepleinshRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java

@@ -277,7 +277,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
             issueJobDetailUpdateReqVOList.forEach(DetailUpdateItem -> {
                 // 匹配任务子表与参数中子表
                 if (DetailUpdateItem.getId().equals(subListItem.getId())) {
-                    List<Map<String,Object>> recordLst = DetailUpdateItem.getRecordLst();
+                    List<Map<String,String>> recordLst = DetailUpdateItem.getRecordList();
                     recordLst.forEach(recordLstItem -> {
                         IssueRecordDetailDO issueRecordDetailDO = new IssueRecordDetailDO();
                         BeanUtils.copyProperties(subListItem, issueRecordDetailDO);
@@ -291,15 +291,15 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
                         // 如果使用在途库 赋值 业务类型对应的在途库库位
                         issueRecordDetailDO.setOnTheWayLocationCode(issueRecordMainDO.getUseOnTheWayLocation().equals("TRUE")?businesstypeDO.getOnTheWayArea():"");
                         // 根据recordLst 进行赋值子表部分数据
-                        issueRecordDetailDO.setQty(new BigDecimal(recordLstItem.get("handleQty").toString()));
+                        issueRecordDetailDO.setQty(new BigDecimal(recordLstItem.get("handleQty")));
-                        issueRecordDetailDO.setToPackingNumber(recordLstItem.get("toPackingNumber").toString());
+                        issueRecordDetailDO.setToPackingNumber(recordLstItem.get("toPackingNumber")==null?"":recordLstItem.get("toPackingNumber"));
-                        issueRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber").toString());
+                        issueRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber"));
-                        issueRecordDetailDO.setToBatch(recordLstItem.get("toBatch").toString());
+                        issueRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch"));
-                        issueRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode").toString());
+                        issueRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode"));
-                        issueRecordDetailDO.setInventoryStatus(recordLstItem.get("toInventoryStatus").toString());
+                        issueRecordDetailDO.setInventoryStatus(recordLstItem.get("toInventoryStatus"));
-                        issueRecordDetailDO.setSupplierCode(recordLstItem.get("supplierCode").toString());
+                        issueRecordDetailDO.setSupplierCode(recordLstItem.get("supplierCode"));
                         // 根据 to库位 查询 库位组 库区
-                        LocationDO locationDO = locationService.selectLocation(recordLstItem.get("toLocationCode").toString());
+                        LocationDO locationDO = locationService.selectLocation(recordLstItem.get("toLocationCode"));
                         issueRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode());
                         issueRecordDetailDO.setToAreaCode(locationDO.getAreaCode());
                         // 根据 from库位 查询 库位组 库区
@@ -322,6 +322,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
                         transactionCreateReqVO.setBatch(issueRecordDetailDO.getToBatch());
                         transactionCreateReqVO.setContainerNumber(issueRecordDetailDO.getToContainerNumber());
                         transactionCreateReqVO.setAmount(BigDecimal.ZERO);
+                        transactionCreateReqVO.setWarehouseCode(issueRecordMainDO.getToWarehouseCode());
                         // 如果使用在途库 库存事务 库位赋值为 在途库
                         transactionCreateReqVO.setLocationCode(issueRecordMainDO.getUseOnTheWayLocation().equals("TRUE")?issueRecordDetailDO.getOnTheWayLocationCode():recordLstItem.get("toLocationCode").toString());
                         transactionCreateReqVOList.add(transactionCreateReqVO);
@@ -389,6 +390,8 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
         //增加业务类型
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductionReceiptJob");
         productionreceiptJobMainDO.setBusinessType(businesstypeDO.getCode());
+        productionreceiptJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        productionreceiptJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         productionreceiptJobMainMapper.insert(productionreceiptJobMainDO);
         //生产收料任务子 集合
         List<ProductionreceiptJobDetailDO> productionreceiptJobDetailDOList = new ArrayList<>();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java

@@ -33,6 +33,7 @@ import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO;
 import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
 import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
 import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
 import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO;
@@ -57,6 +58,7 @@ import com.win.module.wms.service.businesstype.BusinesstypeService;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.itempackaging.ItempackagingService;
 import com.win.module.wms.service.jobsetting.JobsettingService;
 import com.win.module.wms.service.productionline.ProductionlineService;
 import com.win.module.wms.service.productionlineitem.ProductionlineitemService;
@@ -91,6 +93,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
 @Validated
 public class IssueRequestMainServiceImpl implements IssueRequestMainService {
 
+    @Resource
+    private ItempackagingService itempackagingService;
     @Resource
     private ExpectoutService expectoutService;
     @Resource
@@ -446,6 +450,8 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         issueRequestMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
         issueRequestMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         issueRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
+        issueRequestMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        issueRequestMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         return issueRequestMainDO;
     }
     //校验子表公共方法(适用于新增/修改)
@@ -640,6 +646,8 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         issueJobMainDO.setUseOnTheWayLocation(mainDO.getUseOnTheWayLocation());
         issueJobMainDO.setFromWarehouseCode(mainDO.getFromWarehouseCode());
         issueJobMainDO.setToWarehouseCode(mainDO.getToWarehouseCode());
+        issueJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses());
+        issueJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses());
         issueJobMainDO.setRequestTime(mainDO.getRequestTime());
         issueJobMainDO.setRequestDueTime(mainDO.getDueTime());
         issueJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
@@ -648,7 +656,6 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         issueJobMainDO.setToLocationTypes(mainDO.getToLocationTypes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.ISSUE_JOB.getCode());
         issueJobMainDO.setNumber(number);
-        issueJobMainDO.setBusinessType(mainDO.getBusinessType());
         issueJobMainDO.setCreateTime(LocalDateTime.now());
         issueJobMainDO.setFromAreaCodes(mainDO.getFromAreaCodes());
         issueJobMainDO.setToAreaCodes(mainDO.getToAreaCodes());
@@ -669,9 +676,13 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         issueJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
         issueJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
         issueJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
+        //增加业务类型
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("IssueJob");
+        issueJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        issueJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
+        issueJobMainDO.setBusinessType(businesstypeDO.getCode());
         issueJobMainMapper.insert(issueJobMainDO);
 
-
         List<IssueJobDetailDO> issueJobDetailDOList = new ArrayList<>();
         List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
@@ -702,6 +713,8 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
                 issueJobDetailDO.setProjectCode(item.getProjectCode());
                 issueJobDetailDO.setQty(item.getQty());
                 issueJobDetailDO.setUom(item.getUom());
+                issueJobDetailDO.setStdPackQty(itempackagingService.selectItemPackagingExist(item.getItemCode()).getStdPackQty());
+                issueJobDetailDO.setStdPackUnit(itempackagingService.selectItemPackagingExist(item.getItemCode()).getStdPackUnit());
                 issueJobDetailDO.setToOwnerCode(item.getToOwnerCode());
                 issueJobDetailDO.setFromOwnerCode(item.getFromOwnerCode());
                 issueJobDetailDO.setNumber(issueJobMainDO.getNumber());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java

@@ -107,5 +107,5 @@ public interface ProductionreceiptJobMainService {
 
     Integer closeProductionreceiptJobMain(Long id);
 
-    Integer executeProductionreceiptJobMain(ProductionreceiptJobMainUpdateReqVO updateReqVO);
+    String executeProductionreceiptJobMain(ProductionreceiptJobMainUpdateReqVO updateReqVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java

@@ -237,7 +237,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
 
     @Override
     @Transactional
-    public Integer executeProductionreceiptJobMain(ProductionreceiptJobMainUpdateReqVO updateReqVO) {
+    public String executeProductionreceiptJobMain(ProductionreceiptJobMainUpdateReqVO updateReqVO) {
         //查询数据
         ProductionreceiptJobMainDO productionreceiptJobMainDO = this.validateProductionreceiptJobMainExists(updateReqVO.getId());
         List<ProductionreceiptJobDetailDO> subList = productionreceiptJobDetailService.selectList(productionreceiptJobMainDO.getId());
@@ -348,7 +348,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
         expectinService.deleteExpectinByJobNumber(productionreceiptJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(productionreceiptJobMainDO.getId(), "productionreceiptJob", "执行了生产收料任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java

@@ -23,7 +23,7 @@ public interface ProductionreturnRequestDetailService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductionreturnRequestDetail(@Valid ProductionreturnRequestDetailCreateReqVO createReqVO, RequestsettingDO requestsettingDO);
+    Long createProductionreturnRequestDetail(@Valid ProductionreturnRequestDetailCreateReqVO createReqVO);
 
     /**
      * 更新生产退料申请子

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java

@@ -60,11 +60,10 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur
     @Resource
     private TrendsApi trendsApi;
     @Override
-    public Long createProductionreturnRequestDetail(ProductionreturnRequestDetailCreateReqVO createReqVO, RequestsettingDO requestsettingDO) {
+    public Long createProductionreturnRequestDetail(ProductionreturnRequestDetailCreateReqVO createReqVO) {
         // 插入
         ProductionreturnRequestDetailDO productionreturnRequestDetail = ProductionreturnRequestDetailConvert.INSTANCE.convert(createReqVO);
         productionreturnRequestDetailMapper.insert(productionreturnRequestDetail);
-        trendsApi.createTrends(productionreturnRequestDetail.getId(), requestsettingDO.getCode(), "修改了生产退料申请", TrendsTypeEnum.CREATE);
         // 返回
         return productionreturnRequestDetail.getId();
     }
@@ -77,7 +76,6 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur
         ProductionreturnRequestMainDO productionreturnRequestMainToNumber = productionreturnRequestMainService.getProductionreturnRequestMainToNumber(updateReqVO.getNumber());
         ProductionreturnRequestDetailDO updateObj = ProductionreturnRequestDetailConvert.INSTANCE.convert(updateReqVO);
         validatorDetailMethod(updateObj,productionreturnRequestMainToNumber);
-        trendsApi.createTrends(updateObj.getId(), requestsettingDO.getCode(), "修改了生产退料申请", TrendsTypeEnum.UPDATE);
         productionreturnRequestDetailMapper.updateById(updateObj);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java

@@ -24,14 +24,14 @@ public interface ProductionreturnRequestMainService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductionreturnRequestMain(@Valid ProductionreturnRequestMainCreateReqVO createReqVO,BusinesstypeDO businesstypeDO,RequestsettingDO requestsettingDO);
+    Long createProductionreturnRequestMain(@Valid ProductionreturnRequestMainCreateReqVO createReqVO);
 
     /**
      * 更新生产退料申请主
      *
      * @param updateReqVO 更新信息
      */
-    void updateProductionreturnRequestMain(@Valid ProductionreturnRequestMainUpdateReqVO updateReqVO,BusinesstypeDO businesstypeDO,RequestsettingDO requestsettingDO);
+    void updateProductionreturnRequestMain(@Valid ProductionreturnRequestMainUpdateReqVO updateReqVO);
 
     /**
      * 删除生产退料申请主

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java

@@ -29,6 +29,7 @@ import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequ
 import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestMainMapper;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.request.RequestStatusEnum;
+import com.win.module.wms.service.businesstype.BusinesstypeService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.productionline.ProductionlineService;
 import com.win.module.wms.service.productionlineitem.ProductionlineitemService;
@@ -59,6 +60,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
 @Validated
 public class ProductionreturnRequestMainServiceImpl implements ProductionreturnRequestMainService {
 
+    @Resource
+    private BusinesstypeService businesstypeService;
     @Resource
     private ProductionreturnRequestMainMapper productionreturnRequestMainMapper;
     @Resource
@@ -85,27 +88,37 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR
     private TrendsApi trendsApi;
     @Override
     @Transactional
-    public Long createProductionreturnRequestMain(ProductionreturnRequestMainCreateReqVO createReqVO,BusinesstypeDO businesstypeDO,RequestsettingDO requestsettingDO) {
+    public Long createProductionreturnRequestMain(ProductionreturnRequestMainCreateReqVO createReqVO) {
         // 插入
+        BusinesstypeDO businesstypeDO = null;
+        // 判断是否合格退料
+        if (createReqVO.getIsOK()) {
+            businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ReturnToStoreRequest");
+        } else {
+            businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ReturnToHOldRequest");
+        }
+        RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("MaterialReturnRequest");
         ProductionreturnRequestMainDO productionreturnRequestMainDO = validatorToCreate(createReqVO, businesstypeDO, requestsettingDO);
         if(RequestStatusEnum.HANDLING.getCode().equals(productionreturnRequestMainDO.getStatus())) {
 
         }
-        trendsApi.createTrends(requestsettingDO.getId(), requestsettingDO.getCode(), "增加了生产退料申请", TrendsTypeEnum.CREATE);
+        trendsApi.createTrends(productionreturnRequestMainDO.getId(), "ProductionreturnRequest", "增加了合格退料申请", TrendsTypeEnum.CREATE);
         // 返回
         return createReqVO.getId();
     }
 
     @Override
     @Transactional
-    public void updateProductionreturnRequestMain(ProductionreturnRequestMainUpdateReqVO updateReqVO,BusinesstypeDO businesstypeDO,RequestsettingDO requestsettingDO) {
+    public void updateProductionreturnRequestMain(ProductionreturnRequestMainUpdateReqVO updateReqVO) {
         // 校验存在
         validateProductionreturnRequestMainExists(updateReqVO.getId());
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ReturnToStoreRequest");
+        RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("IssueRequest");
         ProductionreturnRequestMainDO productionreturnRequestMainDO = validatorMainMethod(updateReqVO, businesstypeDO, requestsettingDO);
         if(RequestStatusEnum.HANDLING.getCode().equals(productionreturnRequestMainDO.getStatus())) {
 
         }
-        trendsApi.createTrends(requestsettingDO.getId(), requestsettingDO.getCode(), "修改了生产退料申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(productionreturnRequestMainDO.getId(), "ProductionreturnRequest", "修改了生产退料申请", TrendsTypeEnum.UPDATE);
         // 更新
         ProductionreturnRequestMainDO updateObj = ProductionreturnRequestMainConvert.INSTANCE.convert(updateReqVO);
         productionreturnRequestMainMapper.updateById(updateObj);
@@ -248,8 +261,8 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR
         if(workstationDO != null){
             detailDo.setFromLocationCode(workstationDO.getRawLocationCode());
         }
-        ArrayList<String> inventoryStatus = new ArrayList<>();
+        List<String> inventoryStatus = new ArrayList<>();
-        inventoryStatus.set(0,detailDo.getInventoryStatus());
+        inventoryStatus.add(detailDo.getInventoryStatus());
         validatorManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatus);
     }
 
@@ -336,8 +349,8 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR
             message.append(ex.getMessage()).append(",");
         }
         try {
-            ArrayList<String> inventoryStatus = new ArrayList<>();
+            List<String> inventoryStatus = new ArrayList<>();
-            inventoryStatus.set(0,detailDo.getInventoryStatus());
+            inventoryStatus.add(detailDo.getInventoryStatus());
             validatorManagementAccuracy(detailDo.getItemCode(), null, null, detailDo.getFromLocationCode(), inventoryStatus);
         } catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
@@ -372,7 +385,7 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR
 
     private WorkstationDO validatorWorkStation(String workshopCode,String productionLineCode,String workStationCode){
         if(workStationCode != ""){
-            return workstationService.selectWorkstationExist(workshopCode, productionLineCode, workStationCode);
+            return workstationService.selectWorkstationExist(workStationCode, workshopCode, productionLineCode );
         }else {
             return null;
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java

@@ -103,7 +103,7 @@ public interface RepleinshJobMainService {
 
     Integer abandonRepleinshJobMain(Long id);
 
-    Integer executeRepleinshJobMain(RepleinshJobMainUpdateReqVO updateReqVO);
+    String executeRepleinshJobMain(RepleinshJobMainUpdateReqVO updateReqVO);
 
     Integer closeRepleinshJobMain(Long id);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java

@@ -217,7 +217,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
 
     @Override
     @Transactional
-    public Integer executeRepleinshJobMain(RepleinshJobMainUpdateReqVO repleinshJobMainUpdateReqVO) {
+    public String executeRepleinshJobMain(RepleinshJobMainUpdateReqVO repleinshJobMainUpdateReqVO) {
         //查询数据
         RepleinshJobMainDO repleinshJobMainDO = this.validateRepleinshJobMainExists(repleinshJobMainUpdateReqVO.getId());
         List<RepleinshJobDetailDO> subList = repleinshJobDetailService.selectList(repleinshJobMainDO.getId());
@@ -269,7 +269,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
             repleinshJobDetailUpdateReqVOList.forEach(DetailUpdateItem -> {
                 // 匹配任务子表与参数中子表
                 if (DetailUpdateItem.getId().equals(subListItem.getId())) {
-                    List<Map<String,Object>> recordLst = DetailUpdateItem.getRecordLst();
+                    List<Map<String,String>> recordLst = DetailUpdateItem.getRecordList();
                     recordLst.forEach(recordLstItem -> {
                         RepleinshRecordDetailDO repleinshRecordDetailDO = new RepleinshRecordDetailDO();
                         BeanUtils.copyProperties(subListItem, repleinshRecordDetailDO);
@@ -281,15 +281,15 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
                         repleinshRecordDetailDO.setUpdater(null);
                         repleinshRecordDetailDO.setUpdateTime(null);
                         // 根据recordLst 进行赋值子表部分数据
-                        repleinshRecordDetailDO.setQty(new BigDecimal(recordLstItem.get("handleQty").toString()));
+                        repleinshRecordDetailDO.setQty(new BigDecimal(recordLstItem.get("handleQty")));
-                        repleinshRecordDetailDO.setToPackingNumber(recordLstItem.get("toPackingNumber").toString());
+                        repleinshRecordDetailDO.setToPackingNumber(recordLstItem.get("toPackingNumber")==null?"":recordLstItem.get("toPackingNumber"));
-                        repleinshRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber").toString());
+                        repleinshRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber"));
-                        repleinshRecordDetailDO.setToBatch(recordLstItem.get("toBatch").toString());
+                        repleinshRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch"));
-                        repleinshRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode").toString());
+                        repleinshRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode"));
-                        repleinshRecordDetailDO.setInventoryStatus(recordLstItem.get("toInventoryStatus").toString());
+                        repleinshRecordDetailDO.setInventoryStatus(recordLstItem.get("toInventoryStatus"));
-                        repleinshRecordDetailDO.setSupplierCode(recordLstItem.get("supplierCode").toString());
+                        repleinshRecordDetailDO.setSupplierCode(recordLstItem.get("supplierCode"));
                         // 根据 to库位 查询 库位组 库区
-                        LocationDO locationDO = locationService.selectLocation(recordLstItem.get("toLocationCode").toString());
+                        LocationDO locationDO = locationService.selectLocation(recordLstItem.get("toLocationCode"));
                         repleinshRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode());
                         repleinshRecordDetailDO.setToAreaCode(locationDO.getAreaCode());
                         // 根据 from库位 查询 库位组 库区
@@ -329,7 +329,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
         expectoutService.deleteExpectoutByJobNumber(repleinshRecordMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(repleinshRecordMainDO.getId(), "repleinshJob", "执行了补料任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java

@@ -481,6 +481,8 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
         mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes());
         mainDo.setBusinessType(businesstypeDO.getCode());
+        mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         detailDo.setInventoryStatus(businesstypeDO.getInInventoryStatuses());
         //校验物品类型
         jobUtils.selectItembasicExist(itemCode,businesstypeDO);
@@ -511,7 +513,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
         repleinshJobMainDO.setToLocationTypes(mainDO.getToLocationTypes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.REPLEINMENT_JOB.getCode());
         repleinshJobMainDO.setNumber(number);
-        repleinshJobMainDO.setBusinessType(mainDO.getBusinessType());
+//        repleinshJobMainDO.setBusinessType(mainDO.getBusinessType());
         repleinshJobMainDO.setCreateTime(LocalDateTime.now());
         repleinshJobMainDO.setFromAreaCodes(mainDO.getFromAreaCodes());
         repleinshJobMainDO.setToAreaCodes(mainDO.getToAreaCodes());
@@ -532,6 +534,11 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
         repleinshJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
         repleinshJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
         repleinshJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
+        //增加业务类型
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("RepleinmentJob");
+        repleinshJobMainDO.setBusinessType(businesstypeDO.getCode());
+        repleinshJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
+        repleinshJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         repleinshJobMainMapper.insert(repleinshJobMainDO);
 
         List<RepleinshJobDetailDO> repleinshJobDetailDOList = new ArrayList<>();