修改bug。

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

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

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

@@ -1,35 +1,32 @@
 package com.win.module.wms.controller.countPlan;
 
+import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countPlan.vo.*;
-import org.springframework.web.bind.annotation.*;
+import com.win.module.wms.convert.countPlan.CountPlanMainConvert;
-import javax.annotation.Resource;
+import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO;
-import org.springframework.validation.annotation.Validated;
+import com.win.module.wms.service.countPlan.CountPlanMainService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.excel.core.util.ExcelUtils;
-
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.countPlan.vo.*;
-import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO;
-import com.win.module.wms.convert.countPlan.CountPlanMainConvert;
-import com.win.module.wms.service.countPlan.CountPlanMainService;
 
 @Tag(name = "管理后台 - 盘点计划主")
 @RestController
@@ -119,7 +116,7 @@ public class CountPlanMainController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "盘点计划主.xls", "数据", CountPlanMainExcelVO.class, datas);
+        ExcelUtils.write(response, "盘点计划主.xlsx", "数据", CountPlanMainExcelVO.class, datas);
     }
 
 }

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

@@ -1,15 +1,13 @@
 package com.win.module.wms.controller.countPlan.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import com.win.module.wms.enums.DictTypeConstants;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 
 /**
@@ -21,7 +19,7 @@ import com.win.framework.excel.core.convert.DictConvert;
 public class CountPlanDetailExcelVO {
 
     @ExcelProperty(value = "盘点范围类型 ", converter = DictConvert.class)
-    @DictFormat("count_dimension") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.COUNT_DIMENSION)
     private String type;
 
     @ExcelProperty("盘点范围值")
@@ -33,20 +31,11 @@ public class CountPlanDetailExcelVO {
     @ExcelProperty("物品代码")
     private String itemCode;
 
-    @ExcelProperty("备注")
-    private String remark;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建者用户名")
-    private String creator;
-
     @ExcelProperty("计划数量")
     private BigDecimal planQty;
 
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
-    @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
     @ExcelProperty("最后更新时间")
@@ -58,4 +47,13 @@ public class CountPlanDetailExcelVO {
     @ExcelProperty("是否可用")
     private String available;
 
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者用户名")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptRecord;
 
+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;
@@ -26,7 +27,7 @@ public class PurchasereceiptRecordDetailDO 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/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java

@@ -1,14 +1,13 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptRecord;
 
+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 PurchasereceiptRecordMainDO 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/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptRecord;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
@@ -25,7 +26,7 @@ public class PurchaseshortageDetailDO 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/service/businesstype/BusinesstypeServiceImpl.java

@@ -11,7 +11,6 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils;
 import com.win.module.wms.controller.businesstype.vo.*;
 import com.win.module.wms.convert.businesstype.BusinesstypeConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
-import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.mysql.businesstype.BusinesstypeMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -264,7 +263,7 @@ public class BusinesstypeServiceImpl implements BusinesstypeService {
     }
     @Override
     public BusinesstypeDO selectBusinesstypeExist(String pcode){
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<BusinesstypeDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("code",pcode);
         BusinesstypeDO businesstypeDO = businesstypeMapper.selectOne(queryWrapper);
         if(businesstypeDO != null && "TRUE".equals(businesstypeDO.getAvailable())){

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

@@ -38,6 +38,7 @@ import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptReques
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.job.JobStatusState;
 import com.win.module.wms.enums.request.RequestStatusEnum;
+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;
@@ -102,6 +103,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
     private ExpectinService expectinService;
     @Resource
     private PurchaseMainService purchaseMainService;
+    @Resource
+    private BusinesstypeService businesstypeService;
 
     @Override
     public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions) {
@@ -230,6 +233,9 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         //创建采购收货记录主表
         PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = new PurchasereceiptRecordMainDO();
         BeanUtils.copyProperties(purchasereceiptJobMainDO, purchasereceiptRecordMainDO);
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
+        purchasereceiptRecordMainDO.setOutTransaction(businesstypeDO.getOutTransactionType());
+        purchasereceiptRecordMainDO.setInTransaction(businesstypeDO.getInTransactionType());
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode());
         purchasereceiptRecordMainDO.setNumber(number);
         purchasereceiptRecordMainDO.setJobNumber(purchasereceiptJobMainDO.getNumber());
@@ -271,7 +277,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
                 BeanUtils.copyProperties(purchasereceiptRecordDetailDO, transactionCreateReqVO);
                 //增加业务类型
-                BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
                 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode());
                 TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
                 transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java

@@ -187,7 +187,7 @@ public class TransactiontypeServiceImpl implements TransactiontypeService {
     }
     @Override
     public TransactiontypeDO selectTransactiontype(String pcode){
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<TransactiontypeDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("code",pcode);
         TransactiontypeDO transactiontypeDO = transactiontypeMapper.selectOne(queryWrapper);
         if(transactiontypeDO != null && "TRUE".equals(transactiontypeDO.getAvailable())){