库表字段修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java

@@ -32,7 +32,7 @@ public class CustomeritemBaseVO {
     private String customerItemCode;
 
     @Schema(description = "客户计量单位")
-    private String cusotmerUom;
+    private String customerUom;
 
     @Schema(description = "转换率")
     private BigDecimal convertRate;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java

@@ -23,7 +23,7 @@ public class CustomeritemExportReqVO {
     private String customerItemCode;
 
     @Schema(description = "客户计量单位")
-    private String cusotmerUom;
+    private String customerUom;
 
     @Schema(description = "转换率")
     private BigDecimal convertRate;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java

@@ -28,7 +28,7 @@ public class CustomeritemPageReqVO extends PageParam {
     private String customerItemCode;
 
     @Schema(description = "客户计量单位")
-    private String cusotmerUom;
+    private String customerUom;
 
     @Schema(description = "转换率")
     private BigDecimal convertRate;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.customeritem;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;
@@ -50,7 +51,7 @@ public class CustomeritemDO extends BaseDO {
      *
      * 枚举 {@link TODO uom 对应的类}
      */
-    private String cusotmerUom;
+    private String customerUom;
     /**
      * 转换率
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java

@@ -26,7 +26,7 @@ public interface CustomeritemMapper extends BaseMapperX<CustomeritemDO> {
                 .eqIfPresent(CustomeritemDO::getCustomerCode, reqVO.getCustomerCode())
                 .eqIfPresent(CustomeritemDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(CustomeritemDO::getCustomerItemCode, reqVO.getCustomerItemCode())
-                .eqIfPresent(CustomeritemDO::getCusotmerUom, reqVO.getCusotmerUom())
+                .eqIfPresent(CustomeritemDO::getCustomerUom, reqVO.getCustomerUom())
                 .eqIfPresent(CustomeritemDO::getConvertRate, reqVO.getConvertRate())
                 .eqIfPresent(CustomeritemDO::getPackUnit, reqVO.getPackUnit())
                 .eqIfPresent(CustomeritemDO::getPackQty, reqVO.getPackQty())
@@ -49,7 +49,7 @@ public interface CustomeritemMapper extends BaseMapperX<CustomeritemDO> {
                 .eqIfPresent(CustomeritemDO::getCustomerCode, reqVO.getCustomerCode())
                 .eqIfPresent(CustomeritemDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(CustomeritemDO::getCustomerItemCode, reqVO.getCustomerItemCode())
-                .eqIfPresent(CustomeritemDO::getCusotmerUom, reqVO.getCusotmerUom())
+                .eqIfPresent(CustomeritemDO::getCustomerUom, reqVO.getCustomerUom())
                 .eqIfPresent(CustomeritemDO::getConvertRate, reqVO.getConvertRate())
                 .eqIfPresent(CustomeritemDO::getPackUnit, reqVO.getPackUnit())
                 .eqIfPresent(CustomeritemDO::getPackQty, reqVO.getPackQty())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java

@@ -22,6 +22,7 @@ import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.customer.CustomerDO;
 import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO;
+import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO;
 import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanDetailDO;
 import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -36,6 +37,7 @@ import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.businesstype.BusinesstypeService;
 import com.win.module.wms.service.customer.CustomerService;
 import com.win.module.wms.service.customerdock.CustomerdockService;
+import com.win.module.wms.service.customeritem.CustomeritemService;
 import com.win.module.wms.service.deliverRequest.DeliverRequestDetailService;
 import com.win.module.wms.service.deliverRequest.DeliverRequestMainService;
 import com.win.module.wms.service.itembasic.ItembasicService;
@@ -78,6 +80,8 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
     @Resource
     private ItembasicService itembasicService;
     @Resource
+    private CustomeritemService customeritemService;
+    @Resource
     private JobUtils jobUtils;
     @Resource
     private ItempackagingService itempackagingService;
@@ -442,7 +446,8 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
         }
         // 校验物料基础信息
         try {
-            ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode());
+            CustomeritemDO customeritemDO = customeritemService.selectCustomeritemExist(mainDo.getCustomerCode(), detailDo.getItemCode());
+            ItembasicDO itembasicDO = itembasicService.selectItembasic(customeritemDO.getItemCode());
             if (!detailDo.getUom().equals(itembasicDO.getUom())) {
                 messageDetail += "计量单位" + itembasicDO.getUom() + "错误，应该是" + detailDo.getUom() + ",";
             }