change - 生产工单添加上传ERP类型、更新上传ERP状态

os-common/src/main/java/com/os/common/constant/MesConstants.java

@@ -54,4 +54,14 @@ public class MesConstants
      */
     public static final String MES_IS_SALARY_YES = "1";
 
+
+    /**
+     * 工单状态（0未开始 1执行中 2执行完成 3取消 4待执行）
+     */
+    public static final String MES_PLAN_STATUS_NOT = "0";
+    public static final String MES_PLAN_STATUS_IN = "1";
+    public static final String MES_PLAN_STATUS_FINISH = "2";
+    public static final String MES_PLAN_STATUS_CANCEL = "3";
+    public static final String MES_PLAN_STATUS_WAIT = "4";
+
 }

os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java

@@ -165,8 +165,19 @@ public class ProdPlanInfo extends BaseEntity {
     /** 导入类型（0=人工，1=ERP） */
     private String importFlag;
 
+    /** 上传ERP类型（0=未上传，1=已上传） */
+    private String uploadFlag;
+
     private List<ProdPlanDetail> prodPlanDetailList;
 
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+
     public String getImportFlag() {
         return importFlag;
     }

os-mes/src/main/java/com/os/mes/prod/service/IProdPlanInfoService.java

@@ -65,4 +65,11 @@ public interface IProdPlanInfoService {
      * @return
      */
     int orderAddProdPlanInfoList(List<ProdPlanInfo> prodPlanInfos);
+
+    /**
+     * 更新上传ERP状态
+     * @param planCode
+     * @return
+     */
+    int updateProdPlanInfoUploadFlag(String planCode);
 }

os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.os.mes.prod.service.impl;
 
 import java.util.List;
 
+import com.os.common.constant.MesConstants;
 import com.os.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -104,4 +105,24 @@ public class ProdPlanInfoServiceImpl implements IProdPlanInfoService {
         }
         return 1;
     }
+
+    /**
+     * 更新上传ERP状态
+     * @param planCode
+     * @return
+     */
+    @Override
+    public int updateProdPlanInfoUploadFlag(String planCode) {
+        ProdPlanInfo prodPlanInfo = new ProdPlanInfo();
+        prodPlanInfo.setPlanCode(planCode);
+        List<ProdPlanInfo> planInfoList = prodPlanInfoMapper.selectProdPlanInfoList(prodPlanInfo);
+        if (planInfoList != null && !planInfoList.isEmpty()) {
+            ProdPlanInfo planInfo = planInfoList.get(0);
+            planInfo.setUploadFlag(MesConstants.MES_IS_ERP_YES);
+            planInfo.setUpdatedTime(DateUtils.getNowDate());
+            prodPlanInfoMapper.updateProdPlanInfo(planInfo);
+        }
+        return 1;
+    }
+
 }

os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml

@@ -30,6 +30,7 @@
         <result property="classes" column="classes"/>
         <result property="processCode" column="process_code"/>
         <result property="importFlag" column="import_flag"/>
+        <result property="uploadFlag" column="upload_flag"/>
         <collection property="prodPlanDetailList" javaType="java.util.List" resultMap="ProdPlanDetailResult"/>
     </resultMap>
 
@@ -72,6 +73,7 @@
                ppi.plan_end_time,
                ppi.plan_status,
                ppi.process_code,
+               ppi.upload_flag,
                ppi.import_flag
         from prod_plan_info ppi
                  left join base_product_line bpl on bpl.product_line_code = ppi.station_code
@@ -102,6 +104,7 @@
                ppi.plan_end_time,
                ppi.plan_status,
                ppi.classes,
+               ppi.upload_flag,
                ppi.process_code,
                ppd.obj_id            d_obj_id,
                ppd.plan_code         d_plan_code,
@@ -149,6 +152,7 @@
             <if test="planStatus != null  and planStatus != ''">and plan_status = #{planStatus}</if>
             <if test="classes != null  and classes != ''">and classes = #{classes}</if>
             <if test="processCode != null  and processCode != ''">and process_code = #{processCode}</if>
+            <if test="uploadFlag != null  and uploadFlag != ''">and upload_flag = #{uploadFlag}</if>
         </where>
     </select>
 
@@ -182,6 +186,7 @@
             <if test="classes != null">classes,</if>
             <if test="processCode != null">process_code,</if>
             <if test="importFlag != null">import_flag,</if>
+            <if test="uploadFlag != null">upload_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planCode != null and planCode != ''">#{planCode},</if>
@@ -206,6 +211,7 @@
             <if test="classes != null">#{classes},</if>
             <if test="processCode != null">#{processCode},</if>
             <if test="importFlag != null">#{importFlag},</if>
+            <if test="uploadFlag != null">#{uploadFlag},</if>
         </trim>
     </insert>
 
@@ -234,6 +240,7 @@
             <if test="classes != null">classes = #{classes},</if>
             <if test="processCode != null">process_code = #{processCode},</if>
             <if test="importFlag != null">import_flag = #{importFlag},</if>
+            <if test="uploadFlag != null">upload_flag = #{uploadFlag},</if>
         </trim>
         where obj_id = #{objId}
     </update>