问题处理

hx-jushuitan/pom.xml

@@ -22,8 +22,6 @@
             <groupId>com.jst</groupId>
             <artifactId>jst-api</artifactId>
             <version>1.0.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/jst-api-1.0.0.jar</systemPath>
         </dependency>
     </dependencies>
 

hx-mes/src/main/java/com/fjhx/mes/entity/material/vo/MaterialPreparationVo.java

@@ -25,4 +25,13 @@ public class MaterialPreparationVo extends MaterialPreparation {
 
     private String companyName;
 
+    /**
+     * 生产订单号
+     */
+    private String orderCode;
+    /**
+     * 交期
+     */
+    private String deliveryPeriod;
+
 }

hx-mes/src/main/resources/mapper/material/MaterialPreparationMapper.xml

@@ -9,7 +9,7 @@
     </select>
 
     <sql id="pageOrList">
-        select mp.id,
+        SELECT mp.id,
                mp.contract_id,
                mp.contract_detail_id,
                mp.production_order_id,
@@ -18,16 +18,19 @@
                mp.quantity,
                mp.preparation_deadline,
                mp.production_time,
-               mp.status,
+               mp.`status`,
                mp.create_user,
                mp.create_time,
                mp.update_user,
                mp.update_time,
                mp.company_id,
-               pi.`name`      as materialName,
-               pi.custom_code as materialCode
-        from material_preparation mp
-                 left join product_info pi on mp.material_id = pi.id
+               po.`code`      AS orderCode,
+               po.delivery_period,
+               pi.`name`      AS materialName,
+               pi.custom_code AS materialCode
+        FROM material_preparation mp
+                 LEFT JOIN production_order po ON mp.production_order_id = po.id
+                 LEFT JOIN product_info pi ON mp.material_id = pi.id
             ${ew.customSqlSegment}
     </sql>