修改bug。

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

@@ -197,11 +197,11 @@ public class InspectJobMainController {
         return success(result > 0);
     }
 
-    @Operation(summary = "取消承接任务")
+    @Operation(summary = "放弃任务")
-    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:abandon')")
-    @PutMapping(value = "/cancelAccept")
+    @PutMapping(value = "/abandon")
-    public CommonResult<Boolean> cancelAcceptInspectJobMain(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> abandonInspectJobMain(@RequestParam("id") Long id) {
-        int result = inspectJobMainService.cancelAcceptInspectJobMain(id);
+        int result = inspectJobMainService.abandonInspectJobMain(id);
         return success(result > 0);
     }
 

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

@@ -180,11 +180,11 @@ public class PutawayJobMainController {
         return success(result > 0);
     }
 
-    @Operation(summary = "取消承接任务")
+    @Operation(summary = "放弃任务")
-    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:abandon')")
-    @PutMapping(value = "/cancelAccept/{id}")
+    @PutMapping(value = "/abandon")
     public CommonResult<Boolean> cancelAcceptPutawayJobMain(@RequestParam("id") Long id) {
-        int result = putawayJobMainService.cancelAcceptPutawayJobMain(id);
+        int result = putawayJobMainService.abandonPutawayJobMain(id);
         return success(result > 0);
     }
 

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

@@ -93,11 +93,11 @@ public interface InspectJobMainService {
     Integer acceptInspectJobMain(Long id);
 
     /**
-     * 取消承接任务
+     * 放弃任务
      * @param id
      * @return
      */
-    Integer cancelAcceptInspectJobMain(Long id);
+    Integer abandonInspectJobMain(Long id);
 
     /**
      * 执行任务

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

@@ -148,7 +148,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
 
     @Override
     @Transactional
-    public Integer cancelAcceptInspectJobMain(Long id) {
+    public Integer abandonInspectJobMain(Long id) {
         InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id);
         JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus());
         if(!jobStatusState.cancelAccept()) {

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

@@ -644,6 +644,10 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         issueJobMainDO.setFromAreaCodes(mainDO.getFromAreaCodes());
         issueJobMainDO.setToAreaCodes(mainDO.getToAreaCodes());
         issueJobMainDO.setId(null);
+        issueJobMainDO.setCreateTime(null);
+        issueJobMainDO.setCreator(null);
+        issueJobMainDO.setUpdateTime(null);
+        issueJobMainDO.setUpdater(null);
         // 获取任务单据设置
         JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("IssueJob");
         issueJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
@@ -796,6 +800,10 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
             balanceDOListJob.forEach(balanceDOItem -> {
                 IssueJobDetailDO issueJobDetailDO = new IssueJobDetailDO();
                 issueJobDetailDO.setId(null);
+                issueJobDetailDO.setCreateTime(null);
+                issueJobDetailDO.setCreator(null);
+                issueJobDetailDO.setUpdateTime(null);
+                issueJobDetailDO.setUpdater(null);
                 issueJobDetailDO.setProductionLineCode(item.getProductionLineCode());
                 issueJobDetailDO.setWorkStationCode(item.getWorkStationCode());
                 issueJobDetailDO.setOnTheWayLocationCode(issueJobDetailDO.getOnTheWayLocationCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@@ -184,13 +184,13 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
     //公共方法    校验采购订单明细
     @Override
     public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String poLine) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("number", pnumber);
         queryWrapper.eq("supplier_code", psupplierCode);
         PurchaseMainDO purchaseMainDO = purchaseMainMapper.selectOne(queryWrapper);
         if (purchaseMainDO != null && "TRUE".equals(purchaseMainDO.getAvailable())) {
             if (!"CLOSED".equals(purchaseMainDO.getStatus())) {
-                QueryWrapper queryWrapper1 = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("master_id", purchaseMainDO.getId());
                 queryWrapper1.eq("number", pnumber);
                 queryWrapper1.eq("po_line", poLine);
@@ -263,8 +263,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
 
     //主表校验 校验供应商基础信息
     private ShiftDO validatorShiftExist(String supplierCode) {
-        ShiftDO shiftDO = shiftService.selectShiftExist(supplierCode);
+        return shiftService.selectShiftExist(supplierCode);
-        return shiftDO;
     }
 
     //子表校验 校验供应商基础信息
@@ -274,20 +273,17 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
 
     //子表校验 校验物品标包信息
     private ItempackagingDO validatorItemPackagingExist(String itemCode) {
-        ItempackagingDO itempackagingDO =  itempackagingService.selectItemPackagingExist(itemCode);
+        return itempackagingService.selectItemPackagingExist(itemCode);
-        return itempackagingDO;
     }
 
     //子表校验 校验供应商物品
     private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) {
-        SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(supplierCode, itemCode);
+        return supplieritemService.selectSupplierItemExist(supplierCode, itemCode);
-        return supplieritemDO;
     }
 
     //子表校验  校验标准成本价格
     private StdcostpriceDO validatorStdcostpriceExist(String supplierCode, String itemCode) {
-        StdcostpriceDO stdcostpriceDO = stdcostpriceService.selectStdcostpriceExist(supplierCode, itemCode);
+        return stdcostpriceService.selectStdcostpriceExist(supplierCode, itemCode);
-return stdcostpriceDO;
     }
 
 
@@ -533,7 +529,7 @@ return stdcostpriceDO;
                 }
                 purchasePlanMainMapper.insert(purchasePlanMainDO);
                 //新增要货计划子表
-                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
                 purchaseDetailDOQueryWrapper.eq("number", mainDO.getNumber());
                 List<PurchaseDetailDO> purchasePlanDetailDOList = purchaseDetailMapper.selectList(purchaseDetailDOQueryWrapper);
                 for (PurchaseDetailDO purchaseDetailDO : purchasePlanDetailDOList) {
@@ -567,12 +563,12 @@ return stdcostpriceDO;
             throw new ServiceException(PURCHASE_MAIN_EXISTS);
         }
         //查询要货计划子表
-        QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper<>();
         purchasePlanDetailDOQueryWrapper.eq("po_number", mainDO.getNumber());
         List<PurchasePlanDetailDO> purchasePlanDetailDOList = purchasePlanDetailMapper.selectList(purchasePlanDetailDOQueryWrapper);
         for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
             if (purchasePlanDetailDO.getAvailable() != "FALSE") {
-                QueryWrapper<PurchasePlanMainDO> purchasePlanMainDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchasePlanMainDO> purchasePlanMainDOQueryWrapper = new QueryWrapper<>();
                 purchasePlanMainDOQueryWrapper.eq("number", mainDO.getNumber());
                 purchasePlanMainDOQueryWrapper.ne("status", PlanStatusEnum.CLOSED.getCode());
                 PurchasePlanMainDO purchasePlanMainDO = purchasePlanMainMapper.selectOne(purchasePlanMainDOQueryWrapper);
@@ -590,13 +586,13 @@ return stdcostpriceDO;
     @Override
     @Transactional
     public void updateOrderPurchasePlanQty(String poNumber, String poLine, String itemCode, BigDecimal planQty) {
-        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper<>();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
         purchaseMainDOQueryWrapper.eq("status", OrderStatusEnum.PUBLISHED.getCode());
         List<PurchaseMainDO> purchaseMainDOList = purchaseMainMapper.selectList(purchaseMainDOQueryWrapper);
-        if (purchaseMainDOList != null && purchaseMainDOList.size() > 0) {
+        if (purchaseMainDOList != null && !purchaseMainDOList.isEmpty()) {
             for (PurchaseMainDO purchaseMainDO : purchaseMainDOList) {
-                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
                 purchaseDetailDOQueryWrapper.eq("number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("line_number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("item_code", poNumber);
@@ -622,19 +618,19 @@ return stdcostpriceDO;
     @Override
     @Transactional
     public void updateOrderPurchaseReceivedQty(String poNumber, String poLine, String itemCode, BigDecimal receivedQty) {
-        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper<>();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
         purchaseMainDOQueryWrapper.eq("status", OrderStatusEnum.PUBLISHED.getCode());
         List<PurchaseMainDO> purchaseMainDOList = purchaseMainMapper.selectList(purchaseMainDOQueryWrapper);
-        if (purchaseMainDOList != null && purchaseMainDOList.size() > 0) {
+        if (purchaseMainDOList != null && !purchaseMainDOList.isEmpty()) {
             for (PurchaseMainDO purchaseMainDO : purchaseMainDOList) {
-                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
                 purchaseDetailDOQueryWrapper.eq("number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("line_number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("item_code", poNumber);
                 purchaseDetailDOQueryWrapper.eq("available", "TRUE");
                 List<PurchaseDetailDO> purchaseDetailDOList = purchaseDetailMapper.selectList(purchaseDetailDOQueryWrapper);
-                Boolean res = false;
+                boolean res = false;
                 for (PurchaseDetailDO purchaseDetailDO : purchaseDetailDOList) {
                     if ("TRUE".equals(purchaseDetailDO.getAvailable())) {
                         res = true;
@@ -671,13 +667,13 @@ return stdcostpriceDO;
     @Override
     @Transactional
     public void updateOrderPurchaseShippedQty(String poNumber, String poLine, String itemCode, BigDecimal shippedQty) {
-        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper<>();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
         purchaseMainDOQueryWrapper.eq("status", OrderStatusEnum.PUBLISHED.getCode());
         List<PurchaseMainDO> purchaseMainDOList = purchaseMainMapper.selectList(purchaseMainDOQueryWrapper);
-        if (purchaseMainDOList != null && purchaseMainDOList.size() > 0) {
+        if (purchaseMainDOList != null && !purchaseMainDOList.isEmpty()) {
             for (PurchaseMainDO purchaseMainDO : purchaseMainDOList) {
-                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
                 purchaseDetailDOQueryWrapper.eq("number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("line_number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("item_code", poNumber);
@@ -703,13 +699,13 @@ return stdcostpriceDO;
     @Override
     @Transactional
     public void updateOrderPurchaseReturnQty(String poNumber, String poLine, String itemCode, BigDecimal returnedQty) {
-        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper<>();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
         purchaseMainDOQueryWrapper.eq("status", OrderStatusEnum.PUBLISHED.getCode());
         List<PurchaseMainDO> purchaseMainDOList = purchaseMainMapper.selectList(purchaseMainDOQueryWrapper);
-        if (purchaseMainDOList != null && purchaseMainDOList.size() > 0) {
+        if (purchaseMainDOList != null && !purchaseMainDOList.isEmpty()) {
             for (PurchaseMainDO purchaseMainDO : purchaseMainDOList) {
-                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
+                QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
                 purchaseDetailDOQueryWrapper.eq("number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("line_number", poNumber);
                 purchaseDetailDOQueryWrapper.eq("item_code", poNumber);

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

@@ -95,7 +95,7 @@ public interface PurchasereceiptJobMainService {
     Integer acceptPurchasereceiptJobMain(Long id);
 
     /**
-     * 取消承接任务
+     * 放弃任务
      * @param id
      * @return
      */

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

@@ -248,6 +248,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime());
         purchasereceiptRecordMainDO.setAvailable("TRUE");
         purchasereceiptRecordMainDO.setId(null);
+        purchasereceiptRecordMainDO.setCreateTime(null);
+        purchasereceiptRecordMainDO.setCreator(null);
+        purchasereceiptRecordMainDO.setUpdateTime(null);
+        purchasereceiptRecordMainDO.setUpdater(null);
         purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO);
         List<PurchasereceiptJobDetailUpdateReqVO> purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList();
         //收货记录子
@@ -288,6 +292,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
                 purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 purchasereceiptRecordDetailDO.setId(null);
+                purchasereceiptRecordDetailDO.setCreateTime(null);
+                purchasereceiptRecordDetailDO.setCreator(null);
+                purchasereceiptRecordDetailDO.setUpdateTime(null);
+                purchasereceiptRecordDetailDO.setUpdater(null);
                 purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO);
                 //更新采购订单明细的收货数量
                 purchaseMainService.updateOrderPurchaseReceivedQty(purchasereceiptRecordDetailDO.getPoNumber(), purchasereceiptRecordDetailDO.getPoLine(), purchasereceiptRecordDetailDO.getItemCode(), purchasereceiptRecordDetailDO.getQty());
@@ -302,6 +310,9 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 transactionCreateReqVO.setBusinessType(purchasereceiptRecordMainDO.getBusinessType());
                 transactionCreateReqVO.setLocationCode(purchasereceiptJobDetailDO.getFromLocationCode());
                 transactionCreateReqVO.setOwnerCode(purchasereceiptRecordDetailDO.getFromOwnerCode());
+                transactionCreateReqVO.setPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
+                transactionCreateReqVO.setWorker(purchasereceiptJobMainDO.getCompleteUserId());
+                transactionCreateReqVO.setBatch(purchasereceiptJobDetailDO.getBatch());
                 transactionCreateReqVO.setRecordNumber(number);
                 transactionCreateReqVO.setId(null);
                 transactionCreateReqVOList.add(transactionCreateReqVO);
@@ -322,6 +333,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode());
                 purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 purchaseshortageDetailDO.setId(null);
+                purchaseshortageDetailDO.setCreateTime(null);
+                purchaseshortageDetailDO.setCreator(null);
+                purchaseshortageDetailDO.setUpdateTime(null);
+                purchaseshortageDetailDO.setUpdater(null);
                 purchaseshortageDetailDOList.add(purchaseshortageDetailDO);
             }
         }
@@ -389,6 +404,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 //创建子表信息
                 for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : purchasereceiptRecordDetailDOList1) {
                     InspectRequestDetailCreateReqVO inspectRequestDetailCreateReqVO = new InspectRequestDetailCreateReqVO();
+                    BeanUtils.copyProperties(purchasereceiptRecordDetailDO, inspectRequestDetailCreateReqVO);
                     inspectRequestDetailCreateReqVO.setPackingNumber(purchasereceiptRecordDetailDO.getFromPackingNumber());
                     inspectRequestDetailCreateReqVO.setContainerNumber(purchasereceiptRecordDetailDO.getFromContainerNumber());
                     inspectRequestDetailCreateReqVO.setInventoryStatus(purchasereceiptRecordDetailDO.getInventoryStatus());
@@ -405,7 +421,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                     inspectRequestDetailCreateReqVOList.add(inspectRequestDetailCreateReqVO);
                 }
                 inspectRequestMainCreateReqVO.setSubList(inspectRequestDetailCreateReqVOList);
-                inspectRequestMainService.createInspectRequestMain(inspectRequestMainCreateReqVO);
             }
         }
         //采购收货记录 生成后免检物品 创建 上架申请

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -507,6 +507,10 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
             String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode());
             purchasereceiptJobMainDO.setNumber(number);
             purchasereceiptJobMainDO.setId(null);
+            purchasereceiptJobMainDO.setCreateTime(null);
+            purchasereceiptJobMainDO.setCreator(null);
+            purchasereceiptJobMainDO.setUpdateTime(null);
+            purchasereceiptJobMainDO.setUpdater(null);
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
             purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode());
@@ -517,6 +521,10 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                 purchasereceiptJobDetailDO.setNumber(number);
                 purchasereceiptJobDetailDO.setMasterId(purchasereceiptJobMainDO.getId());
                 purchasereceiptJobDetailDO.setId(null);
+                purchasereceiptJobDetailDO.setCreateTime(null);
+                purchasereceiptJobDetailDO.setCreator(null);
+                purchasereceiptJobDetailDO.setUpdateTime(null);
+                purchasereceiptJobDetailDO.setUpdater(null);
                 purchasereceiptJobDetailDOList.add(purchasereceiptJobDetailDO);
                 //预计入
                 ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO();

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

@@ -83,7 +83,7 @@ public interface PurchasereturnJobMainService {
     Integer acceptPurchasereturnJobMain(Long id);
 
     /**
-     * 取消承接任务
+     * 放弃任务
      * @param id
      * @return
      */

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

@@ -226,6 +226,10 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
         purchasereturnRecordMainDO.setNumber(number);
         purchasereturnRecordMainDO.setJobNumber(purchasereturnJobMainDO.getNumber());
         purchasereturnRecordMainDO.setId(null);
+        purchasereturnRecordMainDO.setCreateTime(null);
+        purchasereturnRecordMainDO.setCreator(null);
+        purchasereturnRecordMainDO.setUpdateTime(null);
+        purchasereturnRecordMainDO.setUpdater(null);
         purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO);
         List<PurchasereturnJobDetailUpdateReqVO> purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList();
         //退货记录子
@@ -243,6 +247,10 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
             purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailDO.getPackingNumber());
             purchasereturnRecordDetailDO.setToPackingNumber(purchasereturnJobDetailDO.getPackingNumber());
             purchasereturnRecordDetailDO.setId(null);
+            purchasereturnRecordDetailDO.setCreateTime(null);
+            purchasereturnRecordDetailDO.setCreator(null);
+            purchasereturnRecordDetailDO.setUpdateTime(null);
+            purchasereturnRecordDetailDO.setUpdater(null);
             purchasereturnRecordDetailDOList.add(purchasereturnRecordDetailDO);
             //更新采购订单明细的退货数量
             purchaseMainService.updateOrderPurchaseReturnQty(purchasereturnRecordDetailDO.getPoNumber(), purchasereturnRecordDetailDO.getPoLine(), purchasereturnRecordDetailDO.getItemCode(), purchasereturnRecordDetailDO.getQty());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -345,6 +345,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         purchasereturnJobMainDO.setNumber(number);
         purchasereturnJobMainDO.setRequestDueTime(mainDO.getRequestTime());
         purchasereturnJobMainDO.setId(null);
+        purchasereturnJobMainDO.setCreateTime(null);
+        purchasereturnJobMainDO.setCreator(null);
+        purchasereturnJobMainDO.setUpdateTime(null);
+        purchasereturnJobMainDO.setUpdater(null);
         purchasereturnJobMainMapper.insert(purchasereturnJobMainDO);
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
         List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>();
@@ -353,6 +357,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
             purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode());
             purchasereturnJobDetailDO.setNumber(number);
             purchasereturnJobDetailDO.setId(null);
+            purchasereturnJobDetailDO.setCreateTime(null);
+            purchasereturnJobDetailDO.setCreator(null);
+            purchasereturnJobDetailDO.setUpdateTime(null);
+            purchasereturnJobDetailDO.setUpdater(null);
             purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId());
             purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode());
             purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode());

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

@@ -83,11 +83,11 @@ public interface PutawayJobMainService {
     Integer acceptPutawayJobMain(Long id);
 
     /**
-     * 取消承接任务
+     * 放弃任务
      * @param id
      * @return
      */
-    Integer cancelAcceptPutawayJobMain(Long id);
+    Integer abandonPutawayJobMain(Long id);
 
     /**
      * 执行任务

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

@@ -141,7 +141,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
 
     @Override
     @Transactional
-    public Integer cancelAcceptPutawayJobMain(Long id) {
+    public Integer abandonPutawayJobMain(Long id) {
         PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(id);
         JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus());
         if(!jobStatusState.cancelAccept()) {