Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierdeliverRequest.vo;
 
+import com.win.module.wms.enums.DictTypeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -100,16 +101,20 @@ public class SupplierdeliverRequestMainExcelVO {
     @ExcelProperty("最后更新者用户名")
     private String updater;
 
-    @ExcelProperty("自动提交")
+    @ExcelProperty(value = "自动提交", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoCommit;
 
-    @ExcelProperty("自动通过")
+    @ExcelProperty(value = "自动通过", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoAgree;
 
-    @ExcelProperty("自动执行")
+    @ExcelProperty(value = "自动执行", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoExecute;
 
-    @ExcelProperty("直接生成记录")
+    @ExcelProperty(value = "直接生成记录", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String directCreateRecord;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.controller.supplierdeliverRequest.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.win.framework.excel.core.annotations.OnlyOne;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,43 +23,58 @@ import java.time.LocalDateTime;
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class SupplierdeliverRequestMainImportVO {
 
-    //主表数据
-    @ExcelProperty("订单类型")
-    private String type;
-
-    @ExcelProperty("单据号")
-    private String number;
-
-    @ExcelProperty("行号")
-    private String hang;
+    @ExcelProperty("要货计划单号")
+    private String ppNumber;
 
     @ExcelProperty("供应商代码")
+    @OnlyOne
     private String supplierCode;
 
+    @ExcelProperty("从仓库代码")
+    private String fromWarehouseCode;
+
+    @ExcelProperty("计划到货时间")
+    private LocalDateTime planArriveTime;
+
     @ExcelProperty("联系人姓名")
     private String contactName;
 
     @ExcelProperty("联系人电话")
-    @ColumnWidth(value = 16)
     private String contactPhone;
 
     @ExcelProperty("联系人电子邮件")
-    @ColumnWidth(value = 16)
     private String contactEmail;
 
-    @ExcelProperty("是否寄存订单")
-    private String isConsignment;
+    @ExcelProperty("承运商")
+    private String carrierCode;
 
-    @ExcelProperty("截止日期")
-    private LocalDateTime dueDate;
+    @ExcelProperty("运输方式")
+    private String transferMode;
+
+    @ExcelProperty("车牌号")
+    private String vehiclePlateNumber;
+
+    @ExcelProperty("截止时间")
+    private LocalDateTime dueTime;
 
     //子表数据
     @ExcelProperty("物品代码")
     private String itemCode;
+    @ExcelProperty("批次")
+    private String batch;
+     @ExcelProperty("订单号")
+    private String poNumber;
+    @ExcelProperty("订单行")
+    private String poLine;
     @ExcelProperty("数量")
-    private BigDecimal orderQty;
+    private BigDecimal qty;
     @ExcelProperty("计量单位")
     private String uom;
-    @ExcelProperty("超收百分比")
-    private BigDecimal overReceivingPercent;
+    @ExcelProperty("到货日期")
+    private LocalDateTime arriveDate;
+    @ExcelProperty("生产日期")
+    private LocalDateTime produceDate;
+    @ExcelProperty("过期日期")
+    private LocalDateTime expireDate;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplierdeliverRequest/SupplierdeliverRequestDetailConvert.java

@@ -54,11 +54,9 @@ public interface SupplierdeliverRequestDetailConvert {
     SupplierdeliverRequestDetailExcelVO convert(SupplierdeliverRequestMainDO mainDO, SupplierdeliverRequestDetailDO detailDO);
 
     @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
     })
     SupplierdeliverRequestMainImportErrorVO convert(SupplierdeliverRequestMainCreateReqVO mainVo, SupplierdeliverRequestDetailCreateReqVO detailVo);
     @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
     })
     SupplierdeliverRequestMainImportErrorVO convert(SupplierdeliverRequestMainCreateReqVO mainVo, SupplierdeliverRequestDetailDO detailDo);
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@@ -14,13 +14,11 @@ import com.win.module.wms.controller.countJob.vo.CountJobDetailUpdateReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainUpdateReqVO;
-import com.win.module.wms.convert.countJob.CountJobDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
 import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO;
-import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper;
 import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper;
@@ -64,6 +62,8 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     private SerialNumberApi serialNumberApi;
     @Resource
     private CountRequestMainMapper countRequestMainMapper;
+    @Resource
+    private JobUtils jobUtils;
 
     @Override
     public CountJobMainDO getCountJobMain(Long id) {
@@ -167,6 +167,9 @@ public class CountJobMainServiceImpl implements CountJobMainService {
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
         countRecordMainDO.setNumber(number);
         countRecordMainDO.setJobNumber(countJobMainDO.getNumber());
+        //增加业务类型
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
+        countRecordMainDO.setBusinessType(businesstypeDO.getCode());
         countRecordMainDO.setId(null);
         countRecordMainDO.setCreator(null);
         countRecordMainDO.setCreateTime(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -10,13 +10,9 @@ import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
-import com.win.module.wms.controller.countRecord.vo.CountRecordDetailCreateReqVO;
-import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO;
 import com.win.module.wms.controller.countRequest.vo.*;
 import com.win.module.wms.convert.countJob.CountJobDetailConvert;
 import com.win.module.wms.convert.countJob.CountJobMainConvert;
-import com.win.module.wms.convert.countRecord.CountRecordDetailConvert;
-import com.win.module.wms.convert.countRecord.CountRecordMainConvert;
 import com.win.module.wms.convert.countRequest.CountRequestDetailConvert;
 import com.win.module.wms.convert.countRequest.CountRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@@ -47,7 +43,6 @@ import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.shift.ShiftService;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.util.JobUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -342,25 +337,6 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
      * @param detailDOList 盘点申请子
      */
     private void generateJob(CountRequestMainDO mainDO, List<CountRequestDetailDO> detailDOList) {
-        //跳过任务直接生成记录
-        if("TRUE".equals(mainDO.getDirectCreateRecord())) {
-            CountRecordMainCreateReqVO countRecordMainCreateReqVO = new CountRecordMainCreateReqVO();
-            BeanUtils.copyProperties(mainDO, countRecordMainCreateReqVO);
-            countRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
-            String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
-            countRecordMainCreateReqVO.setNumber(number);
-            //增加业务类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
-            countRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
-            countRecordMainMapper.insert(CountRecordMainConvert.INSTANCE.convert(countRecordMainCreateReqVO));
-            for(CountRequestDetailDO countRequestDetailDO : detailDOList) {
-                CountRecordDetailCreateReqVO countRecordDetailCreateReqVO = new CountRecordDetailCreateReqVO();
-                BeanUtils.copyProperties(countRequestDetailDO, countRecordDetailCreateReqVO);
-                countRecordDetailCreateReqVO.setNumber(number);
-                countRecordDetailMapper.insert(CountRecordDetailConvert.INSTANCE.convert(countRecordDetailCreateReqVO));
-            }
-            return;
-        }
         //按库位拆分任务
         Map<String, List<CountRequestDetailDO>> listMap = new HashMap<>();
         for(CountRequestDetailDO detailDO : detailDOList) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java

@@ -191,7 +191,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_RECORD.getCode());
         countadjustRecordMainCreateReqVO.setNumber(number);
         //增加业务类型
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountadjustRecord");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjustRecord");
         countadjustRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
         CountadjustRecordMainDO countadjustRecordMainDO = CountadjustRecordMainConvert.INSTANCE.convert(countadjustRecordMainCreateReqVO);
         countadjustRecordMainMapper.insert(countadjustRecordMainDO);
@@ -206,7 +206,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(countadjustRecordDetailCreateReqVO, transactionCreateReqVO);
             //增加业务类型
-            BusinesstypeDO countAdjustBusinesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjust");
+            BusinesstypeDO countAdjustBusinesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjustRecord");
             transactionCreateReqVO.setBusinessType(countAdjustBusinesstypeDO.getCode());
             if(countadjustRecordDetailCreateReqVO.getAdjustQty().compareTo(BigDecimal.ZERO) > 0) {
                 TransactiontypeDO transactionTypeDOIn = jobUtils.selectDocumentFromTransactionType(countAdjustBusinesstypeDO.getInTransactionType());