fix :物料维护修改

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java

@@ -70,7 +70,7 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
         String now = DateUtil.now();
 
         //特殊处理，半成品编码=成品编码=物料名称
-        entity.setMaterial_code(entity.getMaterial_name());
+//        entity.setMaterial_code(entity.getMaterial_name());
         entity.setHalf_material_code(entity.getMaterial_name());
 
         entity.setMaterial_id(IdUtil.getSnowflake(1, 1).nextIdStr());

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java

@@ -1,7 +1,6 @@
 package org.nl.wms.ext.mes.service.dto;
 
 import cn.hutool.http.HttpStatus;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.Data;
 
 /**

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml

@@ -41,9 +41,11 @@
             w.point_code AS device_code,
             w.plan_qty,
             IF(w.region_code = 'HN',m.raw_material_code,m.half_material_code) AS material_code,
-            m.material_spec AS product_code,
+            m.product_code AS product_code,
             m.material_spec AS brick_code,
             m.material_model AS formula,
+            m.order_number AS order_number,
+            m.material_code AS material_code,
             IF(LENGTH(m.a_long_side) > 0,m.a_long_side,0) AS a,
             IF(LENGTH(m.b_short_side) > 0,m.b_short_side,0) AS b,
             IF(LENGTH(m.h_height) > 0,m.h_height,0) AS h,

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java

@@ -1,5 +1,6 @@
 package org.nl.wms.pdm.workorder.service.dao.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -21,10 +22,10 @@ public class AcsWorkOrderVo {
      * 半成品物料编码 - 工单物料编码
      */
     private String material_code;
-    /**
-     * 产品代号 - 规格
-     */
-    private String product_code;
+//    /**
+//     * 产品代号 - 规格
+//     */
+//    private String product_code;
     /**
      * 配方 - 型号
      */
@@ -87,4 +88,15 @@ public class AcsWorkOrderVo {
      */
     private String detection_error;
 
+
+    private String order_number;
+
+
+    private String product_code;
+
+
+    private String material_model;
+
+
+
 }