生产计划导入 单位赋值问题

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainImportVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.annotations.OnlyOne;
+import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -73,10 +74,9 @@ public class ProductionMainImportVO {
     @NotNull
     private BigDecimal planQty;
 
-    @ExcelProperty("计量单位")
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @NotNull
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
-    
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java

@@ -322,8 +322,11 @@ public class ProductionMainServiceImpl implements ProductionMainService {
         // 校验物料代码
         try {
             ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode());
-            if (!dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel().equals(detailDo.getUom())) {
+//            if (!dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel().equals(detailDo.getUom())) {
-                message.append("计量单位【").append(detailDo.getUom()).append("】错误，应该是【").append(dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()).append("】").append(",");
+//                message.append("计量单位【").append(detailDo.getUom()).append("】错误，应该是【").append(dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()).append("】").append(",");
+//            }
+            if (!itembasicDO.getUom().equals(detailDo.getUom())) {
+                message.append("计量单位【").append(detailDo.getUom()).append("】错误，应该是【").append(itembasicDO.getUom()).append("】").append(",");
             }
         } catch (Exception e) {
             message.append(e.getMessage()).append(",");