设备管理表结构修改；过程检验工序信息完善；生产工单保存BUG修复。

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java

@@ -95,8 +95,8 @@ public class ProWorkorder extends TreeEntity
     private Date requestDate;
 
     /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mi:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd hh:mi:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     private Date finishDate;
 
     /** 单据状态 */

ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java

@@ -14,6 +14,7 @@ import com.ktg.mes.qc.service.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -116,6 +117,14 @@ public class QcIpqcController extends BaseController
         qcIpqc.setSpecification(workorder.getProductSpc());
         qcIpqc.setUnitOfMeasure(workorder.getUnitOfMeasure());
 
+        //查询工序相关信息
+        List<QcIpqc> infos = qcIpqcService.getProcessInfo(qcIpqc);
+        if(!CollectionUtils.isEmpty(infos)&&infos.size() ==1){
+            qcIpqc.setProcessId(infos.get(0).getProcessId());
+            qcIpqc.setProcessCode(infos.get(0).getProcessCode());
+            qcIpqc.setProcessName(infos.get(0).getProcessName());
+        }
+
         //根据产品和检测类型获取检测模板
         QcTemplate param = new QcTemplate();
         param.setQcTypes(qcIpqc.getIpqcType());
@@ -151,6 +160,9 @@ public class QcIpqcController extends BaseController
             return AjaxResult.error("检测单编码已存在！");
         }
 
+        //对合格品和不合格品数量进行检查
+
+
         //根据工单获取产品信息
         ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(qcIpqc.getWorkorderId());
         qcIpqc.setWorkorderId(workorder.getWorkorderId());
@@ -162,6 +174,14 @@ public class QcIpqcController extends BaseController
         qcIpqc.setSpecification(workorder.getProductSpc());
         qcIpqc.setUnitOfMeasure(workorder.getUnitOfMeasure());
 
+        //查询工序相关信息
+        List<QcIpqc> infos = qcIpqcService.getProcessInfo(qcIpqc);
+        if(!CollectionUtils.isEmpty(infos)&&infos.size() ==1){
+            qcIpqc.setProcessId(infos.get(0).getProcessId());
+            qcIpqc.setProcessCode(infos.get(0).getProcessCode());
+            qcIpqc.setProcessName(infos.get(0).getProcessName());
+        }
+
         //根据产品和检测类型获取检测模板
         QcTemplate param = new QcTemplate();
         param.setQcTypes(qcIpqc.getIpqcType());

ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcMapper.java

@@ -34,6 +34,14 @@ public interface QcIpqcMapper
      */
     public QcIpqc checkIpqcCodeUnique(QcIpqc qcIpqc);
 
+
+    /**
+     * 根据当前传递的过程检验单，查询更多工艺相关信息
+     * @param qcIpqc
+     * @return
+     */
+    public List<QcIpqc> getProcessInfo(QcIpqc qcIpqc);
+
     /**
      * 新增过程检验单
      * 

ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcService.java

@@ -35,6 +35,14 @@ public interface IQcIpqcService
      */
     public String checkIpqcCodeUnique(QcIpqc qcIpqc);
 
+    /**
+     * 根据当前传递的过程检验单，查询更多工艺相关信息
+     * @param qcIpqc
+     * @return
+     */
+    public List<QcIpqc> getProcessInfo(QcIpqc qcIpqc);
+
+
     /**
      * 新增过程检验单
      * 

ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcServiceImpl.java

@@ -57,6 +57,11 @@ public class QcIpqcServiceImpl implements IQcIpqcService
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public List<QcIpqc> getProcessInfo(QcIpqc qcIpqc) {
+        return qcIpqcMapper.getProcessInfo(qcIpqc);
+    }
+
     /**
      * 新增过程检验单
      * 

ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml

@@ -104,7 +104,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkIpqcCodeUnique" parameterType="QcIpqc" resultMap="QcIpqcResult">
         select * from qc_ipqc where ipqc_code = #{ipqcCode}
     </select>
-        
+
+    <select id="getProcessInfo" parameterType="QcIpqc" resultMap="QcIpqcResult">
+        select pw.workorder_id, pw.workorder_code,pw.workorder_name, rp.process_id, rp.process_code,rp.process_name,mw.workstation_id, mw.workstation_code,mw.workstation_name
+        from pro_workorder pw
+                 left join pro_route_product prp
+                           on pw.product_code = prp.item_code
+                 left join pro_route_process rp
+                           on rp.route_id = prp.route_id
+                 left join md_workstation mw
+                           on mw.process_id = rp.process_id
+        <where>
+            <if test="workorderId">and pw.workorder_id = #{workorderId}</if>
+            <if test="workorderCode">and pw.workorder_code = #{workorderCode}</if>
+            <if test="workstationId">and mw.workstation_id = #{workstationId}</if>
+            <if test="workstationCode">and mw.workstation_code = #{workstationCode}</if>
+        </where>
+    </select>
+
+
     <insert id="insertQcIpqc" parameterType="QcIpqc" useGeneratedKeys="true" keyProperty="ipqcId">
         insert into qc_ipqc
         <trim prefix="(" suffix=")" suffixOverrides=",">