修改Bug。

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@@ -78,4 +78,5 @@ public interface DictTypeConstants {
     String INSPECT_FAILED_REASON = "inspect_failed_reason";//不合格原因
     String INSPECT_RESULT = "inspect_result";//检验结果
     String COUNT_DIMENSION = "count_dimension"; // 盘点范围类型
+    String COUNT_TYPE = "count_type";
 }

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

@@ -128,6 +128,8 @@ public class InspectJobMainController {
             List<InspectJobDetailDO> subList = inspectJobDetailService.selectList(mainDO.getId());
             for(InspectJobDetailDO detailDO : subList) {
                 InspectJobMainExcelVO vo = InspectJobMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }

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

@@ -134,6 +134,8 @@ public class PurchasereceiptJobMainController {
             List<PurchasereceiptJobDetailDO> subList = purchasereceiptJobDetailService.selectList(mainDO.getId());
             for (PurchasereceiptJobDetailDO detailDO : subList) {
                 PurchasereceiptJobMainExcelVO vo = PurchasereceiptJobMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }

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

@@ -100,26 +100,17 @@ public class PurchasereceiptJobDetailBaseVO {
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime createTime;
-
-    @Schema(description = "创建者Id")
-    private String creator;
-
     @Schema(description = "从货主代码")
     private String fromOwnerCode;
 
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
-    @Schema(description = "实际数量")
+    @Schema(description = "创建时间")
-    private BigDecimal handleQty;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-
+    private LocalDateTime createTime;
-    @Schema(description = "到包装号")
-    private String toPackingNumber;
 
-    @Schema(description = "到际批次")
+    @Schema(description = "创建者Id")
-    private String toBatch;
+    private String creator;
 
 }

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

@@ -1,9 +1,11 @@
 package com.win.module.wms.controller.purchasereceiptJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
+import lombok.ToString;
+
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 采购收货任务子更新 Request VO")
 @Data
@@ -11,4 +13,19 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class PurchasereceiptJobDetailUpdateReqVO extends PurchasereceiptJobDetailBaseVO {
 
+    @Schema(description = "从货主代码")
+    private String fromOwnerCode;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+    @Schema(description = "实际数量")
+    private BigDecimal handleQty;
+
+    @Schema(description = "到包装号")
+    private String toPackingNumber;
+
+    @Schema(description = "到际批次")
+    private String toBatch;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java

@@ -114,6 +114,8 @@ public class PurchasereceiptRecordMainController {
             List<PurchasereceiptRecordDetailDO> subList = purchasereceiptRecordDetailService.selectList(mainDO.getId());
             for(PurchasereceiptRecordDetailDO detailDO : subList) {
                 PurchasereceiptRecordMainExcelVO vo = PurchasereceiptRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }

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

@@ -126,6 +126,8 @@ public class PurchasereturnJobMainController {
             List<PurchasereturnJobDetailDO> subList = purchasereturnJobDetailService.selectList(mainDO.getId());
             for (PurchasereturnJobDetailDO detailDO : subList) {
                 PurchasereturnJobMainExcelVO vo = PurchasereturnJobMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java

@@ -105,6 +105,8 @@ public class PurchasereturnRecordMainController {
             List<PurchasereturnRecordDetailDO> subList = purchasereturnRecordDetailService.selectList(mainDO.getId());
             for(PurchasereturnRecordDetailDO detailDO : subList) {
                 PurchasereturnRecordMainExcelVO vo = PurchasereturnRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }

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

@@ -122,6 +122,8 @@ public class PutawayJobMainController {
             List<PutawayJobDetailDO> subList = putawayJobDetailService.selectList(mainDO.getId());
             for(PutawayJobDetailDO detailDO : subList) {
                 PutawayJobMainExcelVO vo = PutawayJobMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+                vo.setCreator(user.getNickname());
                 resultList.add(vo);
             }
         }
@@ -141,7 +143,7 @@ public class PutawayJobMainController {
         PutawayJobDetailExportReqVO putawayJobDetailExportReqVO = new PutawayJobDetailExportReqVO();
         PutawayJobDetailExportReqVO putawayJobDetailExportReqVO1 = putawayJobDetailExportReqVO.setMasterid(result.getId());
         List<PutawayJobDetailDO> putawayJobDetailList = putawayJobDetailService.getPutawayJobDetailList(putawayJobDetailExportReqVO1);
-        List<PutawayJobDetailExcelVO> putawayJobDetailExcelVOS = PutawayJobDetailConvert.INSTANCE.convertList02(putawayJobDetailList);
+        List<PutawayJobDetailRespVO> putawayJobDetailExcelVOS = PutawayJobDetailConvert.INSTANCE.convertList(putawayJobDetailList);
         result.setSubList(putawayJobDetailExcelVOS);
         return success(result);
     }

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

@@ -3,10 +3,27 @@ package com.win.module.wms.controller.putawayJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 上架任务子更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PutawayJobDetailUpdateReqVO extends PutawayJobDetailBaseVO {
 
+    @Schema(description = "实际数量")
+    private BigDecimal handleQty;
+
+    @Schema(description = "到包装号")
+    private String toPackingNumber;
+
+    @Schema(description = "到器具")
+    private String toContainerNumber;
+
+    @Schema(description = "到际批次")
+    private String toBatch;
+
+    @Schema(description = "到库存状态")
+    private String toInventoryStatus;
+
 }

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

@@ -12,5 +12,5 @@ import java.util.List;
 public class PutawayJobMainRespVO extends PutawayJobMainBaseVO {
 
     @Schema(description = "上架任务子表job_putaway_detail列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
+    private List<PutawayJobDetailRespVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.putawayRequest.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -85,4 +86,7 @@ public class PutawayRequestDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

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

@@ -25,6 +25,7 @@ public interface PurchasereceiptJobDetailConvert {
 
     PurchasereceiptJobDetailDO convert(PurchasereceiptJobDetailUpdateReqVO bean);
 
+
     PurchasereceiptJobDetailRespVO convert(PurchasereceiptJobDetailDO bean);
 
     List<PurchasereceiptJobDetailRespVO> convertList(List<PurchasereceiptJobDetailDO> list);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayJob/PutawayJobDetailConvert.java

@@ -2,7 +2,6 @@ package com.win.module.wms.convert.putawayJob;
 
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO;
-import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExcelVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailRespVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO;
@@ -32,8 +31,6 @@ public interface PutawayJobDetailConvert {
 
     PageResult<PutawayJobDetailRespVO> convertPage(PageResult<PutawayJobDetailDO> page);
 
-    List<PutawayJobDetailExcelVO> convertList02(List<PutawayJobDetailDO> list);
-
     PutawayJobDetailDO convert(PutawayRequestDetailDO bean);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/requestsetting/RequestsettingDO.java

@@ -1,14 +1,13 @@
 package com.win.module.wms.dal.dataobject.requestsetting;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 申请设置 DO
@@ -27,7 +26,7 @@ public class RequestsettingDO extends BaseDO {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long id;
     /**
      * 代码

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java

@@ -22,6 +22,7 @@ public interface PutawayRequestDetailMapper extends BaseMapperX<PutawayRequestDe
 
     default PageResult<PutawayRequestDetailDO> selectPage(PutawayRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayRequestDetailDO>()
+                .eq(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getBatch, reqVO.getBatch())

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

@@ -35,12 +35,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.INSPECT_JOB_MAIN_NOT_EXISTS;
+import static com.win.module.wms.enums.ErrorCodeConstants.INSPECT_JOB_MAIN_STATUS_ERROR;
 
 /**
  * 检验任务主 Service 实现类
@@ -193,6 +195,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         inspectRecordMainDO.setUpdater(null);
         inspectRecordMainDO.setUpdateTime(null);
         inspectRecordMainMapper.insert(inspectRecordMainDO);
+        BigDecimal goodQty = BigDecimal.ZERO;
+        BigDecimal failedQty = BigDecimal.ZERO;
+        BigDecimal crackQty = BigDecimal.ZERO;
+        BigDecimal notPassedQty = BigDecimal.ZERO;
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
         List<InspectJobDetailUpdateReqVO> inspectJobDetailUpdateReqVOList = inspectJobMainUpdateReqVO.getSubList();
@@ -200,6 +206,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         for(InspectJobDetailUpdateReqVO inspectJobDetailUpdateReqVO : inspectJobDetailUpdateReqVOList) {
             InspectRecordDetailDO inspectRecordDetailDO = new InspectRecordDetailDO();
             BeanUtils.copyProperties(inspectJobDetailUpdateReqVO, inspectRecordDetailDO);
+            goodQty = goodQty.add(inspectRecordDetailDO.getGoodQty());
+            failedQty = failedQty.add(inspectRecordDetailDO.getFailedQty());
+            crackQty = crackQty.add(inspectRecordDetailDO.getCrackQty());
+            notPassedQty = notPassedQty.add(inspectRecordDetailDO.getNotPassedQty());
             inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId());
             inspectRecordDetailDO.setNumber(number);
             inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId()));
@@ -239,6 +249,11 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         }
         if(!inspectRecordDetailDOList.isEmpty()) {
             inspectRecordDetailMapper.insertBatch(inspectRecordDetailDOList);
+            inspectRecordMainDO.setBatchGoodQty(goodQty);
+            inspectRecordMainDO.setBatchFaildQty(failedQty);
+            inspectRecordMainDO.setBatchCrackQty(crackQty);
+            inspectRecordMainDO.setBatchNotPassedQty(notPassedQty);
+            inspectRecordMainMapper.updateById(inspectRecordMainDO);
         }
         List<String> typeList = new ArrayList<>();
         typeList.add(JobStatusEnum.PENDING.getCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java

@@ -136,9 +136,9 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
 
     //判断导入单位是否正确
     private void ifUomSuccess(String itemUom, String uom) {
-        DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictLabel(uom);
+        DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictValue(uom);
         if (dictDataRespDTO != null) {
-            if (!itemUom.equals(dictDataRespDTO.getLabel())) {
+            if (!itemUom.equals(dictDataRespDTO.getValue())) {
                 throw new UtilException("提示单位" + uom + "错误，应该是" + itemUom);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -397,9 +397,9 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
 
     //判断导入单位是否正确
     private void ifUomSuccess(String itemUom, String uom) {
-        DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictLabel(uom);
+        DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictValue(uom);
         if (dictDataRespDTO != null) {
-            if (!itemUom.equals(dictDataRespDTO.getLabel())) {
+            if (!itemUom.equals(dictDataRespDTO.getValue())) {
                 throw new UtilException("提示单位" + uom + "错误，应该是" + itemUom);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java

@@ -252,7 +252,7 @@ public class JobsettingServiceImpl implements JobsettingService {
     }
     @Override
     public JobsettingDO selectJobsettingExist(String pcode){
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<JobsettingDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("code",pcode);
         JobsettingDO jobsettingDO = jobsettingMapper.selectOne(queryWrapper);
         if(jobsettingDO != null && "TRUE".equals(jobsettingDO.getAvailable())){

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

@@ -363,6 +363,15 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         if(!purchaseshortageDetailDOList.isEmpty()) {
             purchaseshortageDetailMapper.insertBatch(purchaseshortageDetailDOList);
         }
+        RuleRespVO ruleRespVO = ruleService.inspect(purchasereceiptRecordMainDO.getSupplierCode(), null);
+        JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
+        if("EXEMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
+            for(TransactionCreateReqVO transactionCreateReqVO : transactionCreateReqVOList) {
+                transactionCreateReqVO.setInventoryStatus("OK");
+            }
+        }
+        //增加库存事务
+        transactionService.createTransaction(transactionCreateReqVOList);
         List<String> typeList = new ArrayList<>();
         typeList.add(JobStatusEnum.PENDING.getCode());
         typeList.add(JobStatusEnum.PROCESSING.getCode());
@@ -376,14 +385,12 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
             purchasereceiptRequestMainDO.setStatus(RequestStatusEnum.PARTIAL.getCode());
             purchasereceiptRequestMainMapper.updateById(purchasereceiptRequestMainDO);
         }
-        RuleRespVO ruleRespVO = ruleService.inspect(purchasereceiptRecordMainDO.getSupplierCode(), null);
         //上架申请子
         List<InspectRequestDetailCreateReqVO> inspectRequestDetailCreateReqVOList = new ArrayList<>();
-        JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
         SwitchDO switchDO1 = switchService.selectSwitchExist("CreateInspectRequestAfterPurchaseReceiptRecordCreated");
         SwitchDO switchDO2 = switchService.selectSwitchExist("ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated");
         //采购收货记录 生成后 创建 到货检验申请
-        if(switchDO1.getEffectiveSetValue().equals("TRUE") && !"EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
+        if(switchDO1.getEffectiveSetValue().equals("TRUE") && !"EXEMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
             //按零件号和批次分组
             Map<String, List<PurchasereceiptRecordDetailDO>> listMap = new HashMap<>();
             for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : purchasereceiptRecordDetailDOList) {
@@ -443,17 +450,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 inspectRequestMainService.createInspectRequestMain(inspectRequestMainCreateReqVO);
             }
         }
-        if("EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
-            for(TransactionCreateReqVO transactionCreateReqVO : transactionCreateReqVOList) {
-                transactionCreateReqVO.setInventoryStatus("OK");
-            }
-        }
-        //增加库存事务
-        transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入
         expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber());
         //采购收货记录 生成后免检物品 创建 上架申请
-        if(switchDO2.getEffectiveSetValue().equals("TRUE") && "EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
+        if(switchDO2.getEffectiveSetValue().equals("TRUE") && "EXEMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
             PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO();
             BeanUtils.copyProperties(purchasereceiptRecordMainDO, putawayRequestMainCreateReqVO);
             List<PutawayRequestDetailCreateReqVO> putawayRequestDetailCreateReqVOList = new ArrayList<>();

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

@@ -28,6 +28,7 @@ import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestM
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 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.purchasereceiptJob.PurchasereceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
@@ -45,14 +46,13 @@ import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.expectin.ExpectinService;
 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.purchase.PurchaseMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.rule.RuleService;
 import com.win.module.wms.service.shift.ShiftService;
 import com.win.module.wms.service.supplier.SupplierService;
-import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.util.JobUtils;
-import io.swagger.v3.core.util.Json;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -111,6 +111,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
     private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper;
     @Resource
     private ExpectinService expectinService;
+    @Resource
+    private JobsettingService jobsettingService;
 
     @Override
     @Transactional
@@ -478,6 +480,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                     listMap.put(key, list);
             }
         }
+        JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchaseReceiptJob");
         //组装任务数据
         for(String mapKey : listMap.keySet()) {
             List<PurchasereceiptRequestDetailDO> purchasereceiptRequestDetailDOList = listMap.get(mapKey);
@@ -488,6 +491,16 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                 if(i % count == 0) {
                     purchasereceiptJobMainCreateReqVO = PurchasereceiptJobMainConvert.INSTANCE.convert(mainDO);
                     purchasereceiptJobMainCreateReqVO.setRequestNumber(mainDO.getNumber());
+                    purchasereceiptJobMainCreateReqVO.setAutoComplete(jobsettingDO.getAutoComplete());
+                    purchasereceiptJobMainCreateReqVO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
+                    purchasereceiptJobMainCreateReqVO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());
+                    purchasereceiptJobMainCreateReqVO.setAllowBiggerQty(jobsettingDO.getAllowBiggerQty());
+                    purchasereceiptJobMainCreateReqVO.setAllowSmallerQty(jobsettingDO.getAllowSmallerQty());
+                    purchasereceiptJobMainCreateReqVO.setAllowModifyInventoryStatus(jobsettingDO.getAllowModifyInventoryStatus());
+                    purchasereceiptJobMainCreateReqVO.setAllowContinuousScanning(jobsettingDO.getAllowContinuousScanning());
+                    purchasereceiptJobMainCreateReqVO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
+                    purchasereceiptJobMainCreateReqVO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
+                    purchasereceiptJobMainCreateReqVO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
                     subList = new ArrayList<>();
                     purchasereceiptJobMainCreateReqVO.setSubList(subList);
                     purchasereceiptJobMainCreateReqVOList.add(purchasereceiptJobMainCreateReqVO);

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

@@ -20,6 +20,7 @@ import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestMai
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
 import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
@@ -40,6 +41,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.jobsetting.JobsettingService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
 import com.win.module.wms.service.purchasereturnRecord.PurchasereturnRecordMainService;
@@ -103,6 +105,8 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
     private LocationService locationService;
     @Resource
     private TrendsApi trendsApi;
+    @Resource
+    private JobsettingService jobsettingService;
 
     @Override
     public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) {
@@ -344,6 +348,17 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode());
         purchasereturnJobMainDO.setNumber(number);
         purchasereturnJobMainDO.setRequestDueTime(mainDO.getRequestTime());
+        JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchaseReturnJob");
+        purchasereturnJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
+        purchasereturnJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
+        purchasereturnJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());
+        purchasereturnJobMainDO.setAllowBiggerQty(jobsettingDO.getAllowBiggerQty());
+        purchasereturnJobMainDO.setAllowSmallerQty(jobsettingDO.getAllowSmallerQty());
+        purchasereturnJobMainDO.setAllowModifyInventoryStatus(jobsettingDO.getAllowModifyInventoryStatus());
+        purchasereturnJobMainDO.setAllowContinuousScanning(jobsettingDO.getAllowContinuousScanning());
+        purchasereturnJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
+        purchasereturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
+        purchasereturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
         purchasereturnJobMainDO.setId(null);
         purchasereturnJobMainDO.setCreateTime(null);
         purchasereturnJobMainDO.setCreator(null);

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

@@ -196,25 +196,55 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
             putawayRecordDetailDO.setMasterId(putawayRecordMainDO.getId());
             putawayRecordDetailDO.setNumber(number);
             putawayRecordDetailDO.setJobDetailId(String.valueOf(putawayJobDetailUpdateReqVO.getId()));
+            putawayRecordDetailDO.setQty(putawayJobDetailUpdateReqVO.getHandleQty());
+            putawayRecordDetailDO.setFromPackingNumber(putawayJobDetailUpdateReqVO.getPackingNumber());
+            putawayRecordDetailDO.setToPackingNumber(putawayJobDetailUpdateReqVO.getToPackingNumber());
+            putawayRecordDetailDO.setFromContainerNumber(putawayJobDetailUpdateReqVO.getContainerNumber());
+            putawayRecordDetailDO.setToContainerNumber(putawayJobDetailUpdateReqVO.getToContainerNumber());
+            putawayRecordDetailDO.setFromBatch(putawayJobDetailUpdateReqVO.getBatch());
+            putawayRecordDetailDO.setToBatch(putawayJobDetailUpdateReqVO.getToBatch());
+            putawayRecordDetailDO.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus());
             putawayRecordDetailDO.setId(null);
             putawayRecordDetailDO.setCreator(null);
             putawayRecordDetailDO.setCreateTime(null);
             putawayRecordDetailDO.setUpdater(null);
             putawayRecordDetailDO.setUpdateTime(null);
             putawayRecordDetailDOList.add(putawayRecordDetailDO);
-            //添加库存事务list
+            //添加库存事务入list
-            TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
+            TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-            BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVO);
+            BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVOIn);
-            //增加业务类型
+            //增加业务入类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PutawayJob");
+            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob");
-            transactionCreateReqVO.setBusinessType(businesstypeDO.getCode());
+            transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-            TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+            TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-            transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
+            transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-            transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
+            transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-            transactionCreateReqVO.setRecordNumber(number);
+            transactionCreateReqVOIn.setWorker(putawayJobMainDO.getCompleteUserId());
-            transactionCreateReqVO.setId(null);
+            transactionCreateReqVOIn.setBatch(putawayJobDetailUpdateReqVO.getToBatch());
+            transactionCreateReqVOIn.setPackingNumber(putawayJobDetailUpdateReqVO.getToPackingNumber());
+            transactionCreateReqVOIn.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus());
+            transactionCreateReqVOIn.setLocationCode(putawayJobDetailUpdateReqVO.getToLocationCode());
+            transactionCreateReqVOIn.setRecordNumber(number);
+            transactionCreateReqVOIn.setId(null);
             //待确定库存事务信息
-            transactionCreateReqVOList.add(transactionCreateReqVO);
+            transactionCreateReqVOList.add(transactionCreateReqVOIn);
+            //添加库存事务出list
+            TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
+            BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVOOut);
+            //增加业务出类型
+            transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
+            TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
+            transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
+            transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
+            transactionCreateReqVOOut.setRecordNumber(number);
+            transactionCreateReqVOOut.setInventoryStatus(putawayJobDetailUpdateReqVO.getInventoryStatus());
+            transactionCreateReqVOOut.setWorker(putawayJobMainDO.getCompleteUserId());
+            transactionCreateReqVOOut.setBatch(putawayJobDetailUpdateReqVO.getBatch());
+            transactionCreateReqVOOut.setPackingNumber(putawayJobDetailUpdateReqVO.getPackingNumber());
+            transactionCreateReqVOOut.setLocationCode(putawayJobDetailUpdateReqVO.getFromLocationCode());
+            transactionCreateReqVOOut.setId(null);
+            //待确定库存事务信息
+            transactionCreateReqVOList.add(transactionCreateReqVOOut);
         }
         if(!putawayRecordDetailDOList.isEmpty()) {
             putawayRecordDetailMapper.insertBatch(putawayRecordDetailDOList);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -23,6 +23,7 @@ import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
 import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
 import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO;
@@ -43,6 +44,7 @@ import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.customer.CustomerService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.jobsetting.JobsettingService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.purchase.PurchaseMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
@@ -105,6 +107,8 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
     private ExpectoutService expectoutService;
     @Resource
     private RuleService ruleService;
+    @Resource
+    private JobsettingService jobsettingService;
 
     @Override
     @Transactional
@@ -206,7 +210,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             }
             //写入数据
             if (flag) {
-                String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
+                String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_REQUEST.getCode());
                 mainDo.setNumber(number);
                 mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
                 mainDo.setRequestTime(LocalDateTime.now());
@@ -323,7 +327,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode());
             putawayRecordMainCreateReqVO.setNumber(number);
             //增加业务类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
+            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord");
             putawayRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
             for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
@@ -339,9 +343,18 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode());
         putawayJobMainDO.setNumber(number);
-        //增加业务类型
+        putawayJobMainDO.setRequestNumber(mainDO.getNumber());
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
+        JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchasePutawayJob");
-        putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
+        putawayJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
+        putawayJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
+        putawayJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());
+        putawayJobMainDO.setAllowBiggerQty(jobsettingDO.getAllowBiggerQty());
+        putawayJobMainDO.setAllowSmallerQty(jobsettingDO.getAllowSmallerQty());
+        putawayJobMainDO.setAllowModifyInventoryStatus(jobsettingDO.getAllowModifyInventoryStatus());
+        putawayJobMainDO.setAllowContinuousScanning(jobsettingDO.getAllowContinuousScanning());
+        putawayJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
+        putawayJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
+        putawayJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
         putawayJobMainMapper.insert(putawayJobMainDO);
         List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
         for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
@@ -357,6 +370,8 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();
             BeanUtils.copyProperties(putawayJobDetailDO, expectoutCreateReqVO);
             expectoutCreateReqVO.setJobNumber(number);
+            expectoutCreateReqVO.setBusinessType(mainDO.getBusinessType());
+            expectoutCreateReqVO.setLocationCode(putawayJobDetailDO.getFromLocationCode());
             expectoutCreateReqVOList.add(expectoutCreateReqVO);
         }
         putawayJobDetailMapper.insertBatch(putawayJobDetailDOList);
@@ -374,7 +389,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         for (PutawayRequestDetailDO detailDO : subDOList) {
             validatorDetailMethod(detailDO, mainDo, businesstypeDO);
         }
-        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_REQUEST.getCode());
         mainDo.setNumber(number);
         mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
         putawayRequestMainMapper.insert(mainDo);