修改外观、物料指标节点逻辑

zkqy-custom-business/src/main/java/com/zkqy/business/domain/InspectionList.java

@@ -26,6 +26,12 @@ public class InspectionList extends BaseEntity
     @Excel(name = "检验单编号")
     private String inspectionListNo;
 
+    /** 批号 */
+    private String lotNumber;
+
+    /** 色号 */
+    private String colourNumber;
+
     /** 销售产品编号 */
     @Excel(name = "销售产品编号")
     private String saleProductNo;
@@ -173,6 +179,22 @@ public class InspectionList extends BaseEntity
         this.inspectionListInfoList = inspectionListInfoList;
     }
 
+    public String getLotNumber() {
+        return lotNumber;
+    }
+
+    public void setLotNumber(String lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+    public String getColourNumber() {
+        return colourNumber;
+    }
+
+    public void setColourNumber(String colourNumber) {
+        this.colourNumber = colourNumber;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zkqy-custom-business/src/main/resources/mapper/business/InspectionListMapper.xml

@@ -7,6 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zkqy.business.domain.InspectionList" id="InspectionListResult">
         <result property="id"    column="id"    />
         <result property="inspectionListNo"    column="inspection_list_no"    />
+        <result property="lotNumber" column="lot_number"/>
+        <result property="colourNumber" column="colour_number"/>
         <result property="saleProductNo"    column="sale_product_no"    />
         <result property="inspectionTime"    column="inspection_time"    />
         <result property="inspectionPersonnel"    column="inspection_personnel"    />
@@ -24,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInspectionListVo">
-        select id, inspection_list_no, sale_product_no, inspection_time, inspection_personnel, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key, index_type from {DBNAME}.inspection_list
+        select id, inspection_list_no,lot_number, colour_number, sale_product_no, inspection_time, inspection_personnel, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key, index_type from {DBNAME}.inspection_list
     </sql>
 
     <select id="selectInspectionListList" parameterType="com.zkqy.business.domain.InspectionList" resultMap="InspectionListResult">
@@ -51,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into {DBNAME}.inspection_list
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="inspectionListNo != null">inspection_list_no,</if>
+            <if test="lotNumber != null">lot_number,</if>
+            <if test="colourNumber != null">colour_number,</if>
             <if test="saleProductNo != null">sale_product_no,</if>
             <if test="inspectionTime != null">inspection_time,</if>
             <if test="inspectionPersonnel != null">inspection_personnel,</if>
@@ -65,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inspectionListNo != null">#{inspectionListNo},</if>
+            <if test="lotNumber != null">#{lotNumber},</if>
+            <if test="colourNumber != null">#{colourNumber},</if>
             <if test="saleProductNo != null">#{saleProductNo},</if>
             <if test="inspectionTime != null">#{inspectionTime},</if>
             <if test="inspectionPersonnel != null">#{inspectionPersonnel},</if>
@@ -83,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update {DBNAME}.inspection_list
         <trim prefix="SET" suffixOverrides=",">
             <if test="inspectionListNo != null">inspection_list_no = #{inspectionListNo},</if>
+            <if test="lotNumber != null">lot_number = #{lotNumber},</if>
+            <if test="colourNumber != null">colour_number = #{colourNumber},</if>
             <if test="saleProductNo != null">sale_product_no = #{saleProductNo},</if>
             <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
             <if test="inspectionPersonnel != null">inspection_personnel = #{inspectionPersonnel},</if>

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AppearanceIndex.java

@@ -43,6 +43,16 @@ public class AppearanceIndex implements IRunBPMService {
         inspectionListInfoParam.getQueryMap().put("inspection_list_no",inspectionList.getResultMap().get("inspection_list_no"));
         inspectionListInfoParam.getQueryMap().put("del_flag","0");
         List<CommonEntity> inspectionListInfoList = commonService.selectList(inspectionListInfoParam);
+
+        //查询当前货品色号信息
+        CommonEntity materielParam = new CommonEntity();
+        materielParam.getBasicMap().put("tableName","materiel");
+        materielParam.getConditionMap().put("materiel_code",saleProducts.getResultMap().get("colour_number"));
+        CommonEntity materiel = commonService.getInfoById(materielParam);
+
+        String materieColorNumber = materiel.getResultMap().get("materie_encoding")+""+materiel.getResultMap().get("materie_color_number");
+        saleProducts.getResultMap().put("materieColorNumber",materieColorNumber);
+
         CommonEntity result = new CommonEntity();
         result.getResultMap().put("saleProducts",saleProducts);
         result.getResultMap().put("inspectionList",inspectionList);

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/PhysicalIndex.java

@@ -42,6 +42,17 @@ public class PhysicalIndex implements IRunBPMService {
         inspectionListInfoParam.getQueryMap().put("inspection_list_no",inspectionList.getResultMap().get("inspection_list_no"));
         inspectionListInfoParam.getQueryMap().put("del_flag","0");
         List<CommonEntity> inspectionListInfoList = commonService.selectList(inspectionListInfoParam);
+
+        //查询当前货品色号信息
+        CommonEntity materielParam = new CommonEntity();
+        materielParam.getBasicMap().put("tableName","materiel");
+        materielParam.getConditionMap().put("materiel_code",saleProducts.getResultMap().get("colour_number"));
+        CommonEntity materiel = commonService.getInfoById(materielParam);
+
+        String materieColorNumber = materiel.getResultMap().get("materie_encoding")+""+materiel.getResultMap().get("materie_color_number");
+        saleProducts.getResultMap().put("materieColorNumber",materieColorNumber);
+
+
         CommonEntity result = new CommonEntity();
         result.getResultMap().put("saleProducts",saleProducts);
         result.getResultMap().put("inspectionList",inspectionList);