开工确认添加状态

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -215,4 +215,9 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
      * 排程信息
      */
     private Map<String, ProductionSchedulingVo> schedulingInfo;
+
+    /**
+     * 是否同意开工
+     */
+    private Integer isAgreeWork;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -81,4 +81,9 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private Integer lackStatus;
 
+    /**
+     * 开工确认状态
+     */
+    private Integer prodConfirmStatus;
+
 }

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -33,6 +33,7 @@
                po.produce_time,
                po.delivery_period,
                po.company_id,
+               po.is_agree_work,
                (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
                pod.remark,
                c.prod_tag,

hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -21,7 +21,8 @@
                c.contract_type,
                c.of_company_id                                                as contractCompanyId,
                c.quality_lv,
-               IFNULL(t2.lackStatus, 0)                                       as lackStatus
+               IFNULL(t2.lackStatus, 0)                                       as lackStatus,
+               pbc.`status`                                                   AS prod_confirm_status
         from production_order po
                  LEFT JOIN contract c ON po.contract_id = c.id
                  LEFT JOIN (SELECT sd.prod_order_id,
@@ -35,6 +36,7 @@
                                 AND ep.`status` IN (10, 30, 60)
                                      LEFT JOIN stock_wait sw ON sw.purchase_id = ep.id
                             GROUP BY sd.prod_order_id) t2 ON t2.prod_order_id = po.id
+                 LEFT JOIN production_begin_confirm pbc ON pbc.id = po.prod_begin_confirm_id
             ${ew.customSqlSegment}
     </select>
     <select id="getSchedulingList" resultType="com.fjhx.mes.entity.production.vo.ProductionOrderVo">