修改bug。

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

@@ -175,7 +175,7 @@ public class PutawayJobMainController {
     }
 
     @Operation(summary = "承接任务")
-    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:accept')")
     @PutMapping(value = "/accept")
     public CommonResult<Boolean> acceptPutawayJobMain(@RequestParam("id") Long id) {
         int result = putawayJobMainService.acceptPutawayJobMain(id);
@@ -183,17 +183,25 @@ public class PutawayJobMainController {
     }
 
     @Operation(summary = "放弃任务")
-    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:abandon')")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:abandon')")
     @PutMapping(value = "/abandon")
     public CommonResult<Boolean> cancelAcceptPutawayJobMain(@RequestParam("id") Long id) {
         int result = putawayJobMainService.abandonPutawayJobMain(id);
         return success(result > 0);
     }
 
+    @PutMapping(value = "/close")
+    @Operation(summary = "关闭任务")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:close')")
+    public CommonResult<Boolean> closePutawayJobMain(@RequestParam("id") Long id) {
+        int result = putawayJobMainService.closePutawayJobMain(id);
+        return success(result > 0);
+    }
+
     @PutMapping("/execute")
     @Operation(summary = "执行采购收货任务主")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:execute')")
     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/controller/putawayJob/vo/PutawayJobMainBaseVO.java

@@ -70,6 +70,9 @@ public class PutawayJobMainBaseVO {
     @Schema(description = "承接人用户ID")
     private String acceptUserId;
 
+    @Schema(description = "承接人用户名")
+    private String acceptUserName;
+
     @Schema(description = "承接时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime acceptTime;
@@ -77,6 +80,9 @@ public class PutawayJobMainBaseVO {
     @Schema(description = "完成人用户ID")
     private String completeUserId;
 
+    @Schema(description = "完成人用户名")
+    private String completeUserName;
+
     @Schema(description = "完成时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime completeTime;

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

@@ -312,9 +312,9 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
                 transactionCreateReqVOIn.setQty(purchasereturnJobDetailUpdateReqVO.getHandleQty());
                 transactionCreateReqVOIn.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus());
                 transactionCreateReqVOIn.setWarehouseCode(purchasereturnJobMainUpdateReqVO.getToWarehouseCode());
-                transactionCreateReqVOOut.setBatch(purchasereturnJobDetailUpdateReqVO.getToBatch());
+                transactionCreateReqVOIn.setBatch(purchasereturnJobDetailUpdateReqVO.getToBatch());
-                transactionCreateReqVOOut.setWorker(purchasereturnJobMainDO.getCompleteUserId());
+                transactionCreateReqVOIn.setWorker(purchasereturnJobMainDO.getCompleteUserId());
-                transactionCreateReqVOOut.setPackingNumber(purchasereturnRecordDetailDO.getFromPackingNumber());
+                transactionCreateReqVOIn.setPackingNumber(purchasereturnRecordDetailDO.getFromPackingNumber());
                 transactionCreateReqVOIn.setId(null);
                 transactionCreateReqVOList.add(transactionCreateReqVOIn);
             }

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

@@ -92,7 +92,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
     private void validatePurchasereturnRequestDetailCreate(PurchasereturnRequestDetailDO detailDo) {
         ItembasicDO itembasicDO = this.validateItem(detailDo);
         if(!itembasicDO.getUom().equals(detailDo.getUom())) {
-            throw exception(ITEMBASIC_UOM_EXCEPTION, itembasicDO.getUom(), itembasicDO.getUom());
+            throw exception(ITEMBASIC_UOM_EXCEPTION, detailDo.getUom(), itembasicDO.getUom());
         }
         this.validateBusinesstype(itembasicDO.getType());
     }

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

@@ -476,11 +476,13 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         detailDo.setProjectCode(itembasicDO.getProject());
         this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
         validatorLocation(detailDo.getFromLocationCode());
-        PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
+        if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) {
-        PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
+            PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
-        mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
+            PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
-        mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
+            mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
-        ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+            mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
+            ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+        }
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         List<String> inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(","));
         BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList);
@@ -559,16 +561,18 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         } catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
-        try {
+        if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) {
-            PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
-            PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
             try {
-                ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+                PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
+                PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
+                try {
+                    ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+                } catch (Exception ex) {
+                    message.append(ex.getMessage()).append(",");
+                }
             } catch (Exception ex) {
                 message.append(ex.getMessage()).append(",");
             }
-        } catch (Exception ex) {
-            message.append(ex.getMessage()).append(",");
         }
         try {
             List<String> inventoryStatusList = new ArrayList<>();

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

@@ -89,6 +89,13 @@ public interface PutawayJobMainService {
      */
     Integer abandonPutawayJobMain(Long id);
 
+    /**
+     * 关闭任务
+     * @param id
+     * @return
+     */
+    Integer closePutawayJobMain(Long id);
+
     /**
      * 执行任务
      * @param putawayJobMainUpdateReqVO

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

@@ -15,14 +15,12 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
-import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
-import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper;
 import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper;
@@ -157,6 +155,19 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
         return putawayJobMainMapper.updateById(putawayJobMainDO);
     }
 
+    @Override
+    @Transactional
+    public Integer closePutawayJobMain(Long id) {
+        PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(id);
+        JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus());
+        if(!jobStatusState.close()) {
+            throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR);
+        }
+        putawayJobMainDO.setStatus(jobStatusState.getState().getCode());
+        trendsApi.createTrends(id, "putawayJob", "关闭了上架任务", TrendsTypeEnum.UPDATE);
+        return putawayJobMainMapper.updateById(putawayJobMainDO);
+    }
+
     @Override
     @Transactional
     public String executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) {