修改bug。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java

@@ -106,8 +106,7 @@ public class CountPlanMainController {
     @Operation(summary = "导出盘点计划主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:count-plan-main:export')")
     @OperateLog(type = EXPORT)
-    public void exportCountPlanMainExcel(@Valid CountPlanMainExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
+    public void exportCountPlanMainExcel(@Valid CountPlanMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
         List<CountPlanMainDO> list = countPlanMainService.getCountPlanMainList(exportReqVO);
         // 导出 Excel
         List<CountPlanMainExcelVO> datas = CountPlanMainConvert.INSTANCE.convertList02(list);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -191,16 +191,16 @@ public class InspectJobMainController {
 
     @Operation(summary = "承接任务")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')")
-    @PostMapping(value = "/accept/{id}")
-    public CommonResult<Boolean> acceptInspectJobMain(@PathVariable("id") Long id) {
+    @PutMapping(value = "/accept")
+    public CommonResult<Boolean> acceptInspectJobMain(@RequestParam("id") Long id) {
         int result = inspectJobMainService.acceptInspectJobMain(id);
         return success(result > 0);
     }
 
     @Operation(summary = "取消承接任务")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')")
-    @PostMapping(value = "/cancelAccept/{id}")
-    public CommonResult<Boolean> cancelAcceptInspectJobMain(@PathVariable("id") Long id) {
+    @PutMapping(value = "/cancelAccept")
+    public CommonResult<Boolean> cancelAcceptInspectJobMain(@RequestParam("id") Long id) {
         int result = inspectJobMainService.cancelAcceptInspectJobMain(id);
         return success(result > 0);
     }
@@ -209,9 +209,9 @@ public class InspectJobMainController {
     @Operation(summary = "执行任务")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')")
-    public CommonResult<Boolean> executeInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
-        Integer count = inspectJobMainService.executeInspectJobMain(updateReqVO);
-        return success(count > 0);
+    public CommonResult<String> executeInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
+        String number = inspectJobMainService.executeInspectJobMain(updateReqVO);
+        return success(number);
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@@ -151,8 +151,8 @@ public class PurchasereceiptJobMainController {
             return success(result);
         }
         List<PurchasereceiptJobDetailDO> purchasereceiptJobDetailList = purchasereceiptJobDetailService.selectList(result.getId());
-        List<PurchasereceiptJobDetailExcelVO> purchasereceiptJobDetailExcelVOS = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(purchasereceiptJobDetailList);
-        result.setSubList(purchasereceiptJobDetailExcelVOS);
+        List<PurchasereceiptJobDetailRespVO> purchasereceiptJobDetailExcelVOList = PurchasereceiptJobDetailConvert.INSTANCE.convertList(purchasereceiptJobDetailList);
+        result.setSubList(purchasereceiptJobDetailExcelVOList);
         return success(result);
     }
 
@@ -171,7 +171,7 @@ public class PurchasereceiptJobMainController {
         return success(countByStatus);
     }
 
-    @GetMapping(value = "/accept")
+    @PutMapping(value = "/accept")
     @Operation(summary = "承接任务")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')")
     public CommonResult<Boolean> acceptPurchasereceiptJobMain(@RequestParam("id") Long id) {
@@ -179,7 +179,7 @@ public class PurchasereceiptJobMainController {
         return success(result > 0);
     }
 
-    @GetMapping(value = "/abandon")
+    @PutMapping(value = "/abandon")
     @Operation(summary = "放弃任务")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:abandon')")
     public CommonResult<Boolean> abandonPurchasereceiptJobMain(@RequestParam("id") Long id) {
@@ -187,7 +187,7 @@ public class PurchasereceiptJobMainController {
         return success(result > 0);
     }
 
-    @GetMapping(value = "/close")
+    @PutMapping(value = "/close")
     @Operation(summary = "关闭任务")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:close')")
     public CommonResult<Boolean> closePurchasereceiptJobMain(@RequestParam("id") Long id) {
@@ -199,9 +199,9 @@ public class PurchasereceiptJobMainController {
     @Operation(summary = "执行采购收货任务主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')")
-    public CommonResult<Boolean> executePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
-        Integer count = purchasereceiptJobMainService.executePurchasereceiptJobMain(updateReqVO);
-        return success(count > 0);
+    public CommonResult<String> executePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
+        String number = purchasereceiptJobMainService.executePurchasereceiptJobMain(updateReqVO);
+        return success(number);
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.controller.purchasereceiptJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.util.List;
 
 @Schema(description = "管理后台 - 采购收货任务主 Response VO")
@@ -12,5 +14,5 @@ import java.util.List;
 public class PurchasereceiptJobMainRespVO extends PurchasereceiptJobMainBaseVO {
 
     @Schema(description = "收货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
+    private List<PurchasereceiptJobDetailRespVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java

@@ -143,12 +143,12 @@ public class PurchasereturnJobMainController {
             return success(result);
         }
         List<PurchasereturnJobDetailDO> purchasereturnJobDetailList = purchasereturnJobDetailService.selectList(result.getId());
-        List<PurchasereturnJobDetailExcelVO> purchasereturnJobDetailExcelVOS = PurchasereturnJobDetailConvert.INSTANCE.convertList02(purchasereturnJobDetailList);
-        result.setSubList(purchasereturnJobDetailExcelVOS);
+        List<PurchasereturnJobDetailRespVO> purchasereturnJobDetailRespVOList = PurchasereturnJobDetailConvert.INSTANCE.convertList(purchasereturnJobDetailList);
+        result.setSubList(purchasereturnJobDetailRespVOList);
         return success(result);
     }
 
-    @PostMapping("/getCountByStatus")
+    @GetMapping("/getCountByStatus")
     @Operation(summary = "APP获得采购收货任务数量根据任务状态")
     @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
@@ -163,4 +163,37 @@ public class PurchasereturnJobMainController {
         return success(countByStatus);
     }
 
+    @PutMapping(value = "/accept")
+    @Operation(summary = "承接任务")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:accept')")
+    public CommonResult<Boolean> acceptPurchasereceiptJobMain(@RequestParam("id") Long id) {
+        int result = purchasereturnJobMainService.acceptPurchasereturnJobMain(id);
+        return success(result > 0);
+    }
+
+    @PutMapping(value = "/abandon")
+    @Operation(summary = "放弃任务")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:abandon')")
+    public CommonResult<Boolean> abandonPurchasereceiptJobMain(@RequestParam("id") Long id) {
+        int result = purchasereturnJobMainService.abandonPurchasereturnJobMain(id);
+        return success(result > 0);
+    }
+
+    @PutMapping(value = "/close")
+    @Operation(summary = "关闭任务")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:close')")
+    public CommonResult<Boolean> closePurchasereceiptJobMain(@RequestParam("id") Long id) {
+        int result = purchasereturnJobMainService.closePurchasereturnJobMain(id);
+        return success(result > 0);
+    }
+
+    @PutMapping("/execute")
+    @Operation(summary = "执行采购收货任务主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:execute')")
+    public CommonResult<String> executePurchasereceiptJobMain(@Valid @RequestBody PurchasereturnJobMainUpdateReqVO updateReqVO) {
+        String number = purchasereturnJobMainService.executePurchasereturnJobMain(updateReqVO);
+        return success(number);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java

@@ -12,7 +12,6 @@ import java.util.List;
 public class PurchasereturnJobMainRespVO extends PurchasereturnJobMainBaseVO {
 
     @Schema(description = "退货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
-
+    private List<PurchasereturnJobDetailRespVO> subList;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java

@@ -197,8 +197,8 @@ public class PurchasereturnRequestMainController {
             return success(result);
         }
         List<PurchasereturnRequestDetailDO> list = purchasereturnRequestDetailService.selectList(result.getId());
-        List<PurchasereturnRequestDetailExcelVO> vos = PurchasereturnRequestDetailConvert.INSTANCE.convertList02(list);
-        result.setSubList(vos);
+        List<PurchasereturnRequestDetailRespVO> purchasereturnRequestDetailRespVOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList(list);
+        result.setSubList(purchasereturnRequestDetailRespVOList);
         return success(result);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java

@@ -12,5 +12,5 @@ import java.util.List;
 public class PurchasereturnRequestMainRespVO extends PurchasereturnRequestMainBaseVO {
 
     @Schema(description = " 采购退货申请子表request_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
+    private List<PurchasereturnRequestDetailRespVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java

@@ -174,16 +174,16 @@ public class PutawayJobMainController {
 
     @Operation(summary = "承接任务")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')")
-    @PostMapping(value = "/accept/{id}")
-    public CommonResult<Boolean> acceptPutawayJobMain(@PathVariable("id") Long id) {
+    @PutMapping(value = "/accept")
+    public CommonResult<Boolean> acceptPutawayJobMain(@RequestParam("id") Long id) {
         int result = putawayJobMainService.acceptPutawayJobMain(id);
         return success(result > 0);
     }
 
     @Operation(summary = "取消承接任务")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')")
-    @PostMapping(value = "/cancelAccept/{id}")
-    public CommonResult<Boolean> cancelAcceptPutawayJobMain(@PathVariable("id") Long id) {
+    @PutMapping(value = "/cancelAccept/{id}")
+    public CommonResult<Boolean> cancelAcceptPutawayJobMain(@RequestParam("id") Long id) {
         int result = putawayJobMainService.cancelAcceptPutawayJobMain(id);
         return success(result > 0);
     }
@@ -192,9 +192,9 @@ public class PutawayJobMainController {
     @Operation(summary = "执行采购收货任务主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')")
-    public CommonResult<Boolean> executePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) {
-        Integer count = putawayJobMainService.executePutawayJobMain(updateReqVO);
-        return success(count > 0);
+    public CommonResult<String> executePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) {
+        String number = putawayJobMainService.executePutawayJobMain(updateReqVO);
+        return success(number);
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobDetailConvert.java

@@ -2,7 +2,6 @@ package com.win.module.wms.convert.purchasereceiptJob;
 
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailCreateReqVO;
-import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExcelVO;
 import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailRespVO;
 import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
@@ -32,8 +31,6 @@ public interface PurchasereceiptJobDetailConvert {
 
     PageResult<PurchasereceiptJobDetailRespVO> convertPage(PageResult<PurchasereceiptJobDetailDO> page);
 
-    List<PurchasereceiptJobDetailExcelVO> convertList02(List<PurchasereceiptJobDetailDO> list);
-
     PurchasereceiptJobDetailCreateReqVO convert(PurchasereceiptRequestDetailDO bean);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnJob/PurchasereturnJobDetailConvert.java

@@ -2,7 +2,6 @@ package com.win.module.wms.convert.purchasereturnJob;
 
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExcelVO;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailRespVO;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
@@ -32,8 +31,6 @@ public interface PurchasereturnJobDetailConvert {
 
     PageResult<PurchasereturnJobDetailRespVO> convertPage(PageResult<PurchasereturnJobDetailDO> page);
 
-    List<PurchasereturnJobDetailExcelVO> convertList02(List<PurchasereturnJobDetailDO> list);
-
     PurchasereturnJobDetailDO convert(PurchasereturnRequestDetailDO bean);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRequest/PurchasereturnRequestDetailConvert.java

@@ -33,8 +33,6 @@ public interface PurchasereturnRequestDetailConvert {
 
     PageResult<PurchasereturnRequestDetailRespVO> convertPage(PageResult<PurchasereturnRequestDetailDO> page);
 
-    List<PurchasereturnRequestDetailExcelVO> convertList02(List<PurchasereturnRequestDetailDO> list);
-
     List<PurchasereturnRequestDetailDO> convertList03(List<PurchasereturnRequestDetailCreateReqVO> list);
 
     List<PurchasereturnRequestDetailDO> convertList04(List<PurchasereturnRequestDetailUpdateReqVO> list);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java

@@ -104,6 +104,6 @@ public interface InspectJobMainService {
      * @param inspectJobMainUpdateReqVO
      * @return
      */
-    Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO);
+    String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -164,7 +164,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
 
     @Override
     @Transactional
-    public Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) {
+    public String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) {
         //查询数据
         InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(inspectJobMainUpdateReqVO.getId());
         JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus());
@@ -245,7 +245,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         expectinService.deleteExpectinByJobNumber(inspectJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(inspectJobMainDO.getId(), "inspectJob", "执行了到货检验任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     private InspectJobMainDO validateInspectJobMainExists(Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java

@@ -113,6 +113,6 @@ public interface PurchasereceiptJobMainService {
      * @param purchasereceiptJobMainUpdateReqVO
      * @return
      */
-    Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO);
+    String executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -22,6 +22,7 @@ import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
@@ -42,6 +43,7 @@ import com.win.module.wms.service.businesstype.BusinesstypeService;
 import com.win.module.wms.service.documentSwitch.SwitchService;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.inspectRequest.InspectRequestMainService;
+import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.purchase.PurchaseMainService;
 import com.win.module.wms.service.rule.RuleService;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
@@ -105,6 +107,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
     private PurchaseMainService purchaseMainService;
     @Resource
     private BusinesstypeService businesstypeService;
+    @Resource
+    private LocationService locationService;
 
     @Override
     public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions) {
@@ -212,7 +216,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
 
     @Override
     @Transactional
-    public Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) {
+    public String executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) {
         //查询数据
         PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(purchasereceiptJobMainUpdateReqVO.getId());
         List<PurchasereceiptJobDetailDO> subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId());
@@ -239,6 +243,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode());
         purchasereceiptRecordMainDO.setNumber(number);
         purchasereceiptRecordMainDO.setJobNumber(purchasereceiptJobMainDO.getNumber());
+        purchasereceiptRecordMainDO.setExecuteTime(LocalDateTime.now());
+        purchasereceiptRecordMainDO.setActiveDate(LocalDateTime.now());
+        purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime());
+        purchasereceiptRecordMainDO.setAvailable("TRUE");
         purchasereceiptRecordMainDO.setId(null);
         purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO);
         List<PurchasereceiptJobDetailUpdateReqVO> purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList();
@@ -269,6 +277,16 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
                 purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailUpdateReqVOTemp.getToPackingNumber());
                 purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVOTemp.getHandleQty());
+                purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
+                purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
+                purchasereceiptRecordDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
+                purchasereceiptRecordDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
+                LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode());
+                purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
+                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
+                purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 purchasereceiptRecordDetailDO.setId(null);
                 purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO);
                 //更新采购订单明细的收货数量
@@ -293,6 +311,16 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchaseshortageDetailDO.setMasterId(purchasereceiptRecordMainDO.getId());
                 purchaseshortageDetailDO.setNumber(number);
                 purchaseshortageDetailDO.setJobDetailId(String.valueOf(purchasereceiptJobDetailDO.getId()));
+                purchaseshortageDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
+                purchaseshortageDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
+                purchaseshortageDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
+                purchaseshortageDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
+                LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode());
+                purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
+                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode());
+                purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 purchaseshortageDetailDO.setId(null);
                 purchaseshortageDetailDOList.add(purchaseshortageDetailDO);
             }
@@ -394,7 +422,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "执行了采购收货任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java

@@ -101,6 +101,6 @@ public interface PurchasereturnJobMainService {
      * @param purchasereturnJobMainUpdateReqVO
      * @return
      */
-    Integer executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO);
+    String executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@@ -201,7 +201,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
 
     @Override
     @Transactional
-    public Integer executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO) {
+    public String executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO) {
         //查询数据
         PurchasereturnJobMainDO purchasereturnJobMainDO = this.validatePurchasereturnJobMainExists(purchasereturnJobMainUpdateReqVO.getId());
         List<PurchasereturnJobDetailDO> subList = purchasereturnJobDetailService.selectList(purchasereturnJobMainDO.getId());
@@ -282,7 +282,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
         expectoutService.deleteExpectoutByJobNumber(purchasereturnJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(purchasereturnJobMainDO.getId(), "purchasereturnJob", "执行了采购退货任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     private PurchasereturnJobMainDO validatePurchasereturnJobMainExists(Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java

@@ -94,6 +94,6 @@ public interface PutawayJobMainService {
      * @param putawayJobMainUpdateReqVO
      * @return
      */
-    Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO);
+    String executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java

@@ -157,7 +157,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
 
     @Override
     @Transactional
-    public Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) {
+    public String executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) {
         //查询数据
         PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(putawayJobMainUpdateReqVO.getId());
         JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus());
@@ -238,7 +238,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
         expectinService.deleteExpectinByJobNumber(putawayJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(putawayJobMainDO.getId(), "putawayJob", "执行了上架任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 
     private PutawayJobMainDO validatePutawayJobMainExists(Long id) {