打样申请 多级联动

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp

@@ -69,12 +69,18 @@
     <hr>
     <div><h3>工艺设置</h3></div>
 
-    <div><h4>工艺</h4></div>
-    <div id="technologyGrid" style="margin: 2px;"></div>
+    <div id="technology">
+        <div><h4>工艺</h4></div>
+        <div id="technologyGrid" style="margin: 2px;"></div>
+    </div>
 
-    <div><h4>工序</h4></div>
-    <div id="processGrid" style="margin: 2px;"></div>
+    <div id="process">
+        <div><h4>工序</h4></div>
+        <div id="processGrid" style="margin: 2px;"></div>
+    </div>
 
     <div><h4>工序物料</h4></div>
     <div id="processBomGrid" style="margin: 2px;"></div>
+
+
 </div>

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js

@@ -13,9 +13,9 @@ function initializateUI() {
 
 function loadTechnologyListGrid() {
 	var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-		addHandler: function(){
-			addHandler();
-		},
+		// addHandler: function(){
+		// 	addHandler();
+		// },
 		updateHandler: function(){
 			updateHandler();
 		},
@@ -99,7 +99,6 @@ function addHandler(){
 }
 
 function updateHandler(proofingMakeId){
-	debugger
 	if (!proofingMakeId) {
 		console.log(gridManager)
 		//获取所选行id

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp

@@ -24,5 +24,7 @@
                 </div>
         </div>
 </div>
+
+
 </body>
 </html>
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeDetail.jsp

@@ -30,11 +30,11 @@
             <x:inputC name="proofingApplyProductNo"  readonly="true"   label="产品代号"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="proofingType"   readonly="true"  label="打样形式"  labelCol="2" fieldCol="2"/>
 
-            <x:selectC name="page"   label="版面"  dictionary="prodcutLayout" labelCol="2" fieldCol="2"/>
+            <x:inputC name="page"   label="版面" labelCol="2" fieldCol="2"/>
 
             <x:inputC name="proofingApplyAllocationType"   label="分配方式"  maxLength="32" labelCol="2" fieldCol="2"/>
 
-            <x:selectC name="productType"  label="产品类别"  dictionary="productType" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productType"  label="产品类别"   labelCol="2" fieldCol="2"/>
 
             <x:inputC name="proofingApplySurfaceTreatment"  readonly="true"   label="表面处理"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="proofingApplyNgReReason"  readonly="true"   label="NG重新打样原因"  maxLength="32" labelCol="2" fieldCol="2"/>
@@ -52,7 +52,7 @@
             <x:inputC name="proofingApplyTestStandard"   label="申请单状态"  maxLength="32" labelCol="2" fieldCol="2"/>
             <div class="container-fluid">
                 <x:title title="附件上传" name="group"/>
-                <x:fileList bizCode="providerFile" bizId="id" id="DataLibraryList"  isClass="true"/>
+                <x:fileList bizCode="providerFile" bizId="bizId" id="proofingMakeDetail"  isClass="true"/>
             </div>
         </div>
 
@@ -80,7 +80,21 @@
             <x:inputC name="productLayerNum"  required="false" label="样品制造单状态"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="productLayerNum"  required="false" label="是否确认"  maxLength="32" labelCol="2" fieldCol="2"/>
         </div>
+        <div><h3>排版参数</h3></div>
+        <div class="hg-form-cols" >
+             <x:inputC name="modulus" required="false" label="模数"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="rowNum"  required="false" label="列"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="columnNum"  required="false" label="行"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="contactNum"  required="false" label="搭版数"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="rowDoubleBlade"  required="false" label="列双刀位(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="columnDoubleBlade"  required="false" label="行双刀位(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="dispatchMultiple"  required="false" label="派工倍数"  maxLength="32" labelCol="2" fieldCol="2"/>
 
+            <x:inputC name="sheetLength"  required="false" label="印张长度(cm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="sheetWidth"  required="false" label="印张宽度(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productLayerNum"  required="false" label="印刷正面颜色"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productLayerNum"  required="false" label="印刷反面颜色"  maxLength="32" labelCol="2" fieldCol="2"/>
+        </div>
     </form>
 
 </div>

topsun/src/main/java/com/huigou/topsun/product/repository/ProductPublishedConfRepository.java

@@ -9,4 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @Description:
  */
 public interface ProductPublishedConfRepository extends JpaRepository<ProductPublishedConf,String> {
+
+    ProductPublishedConf getProductPublishedConfByProductId(String productId);
 }

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java

@@ -7,6 +7,9 @@ import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.vo.BomVo;
 
 import com.huigou.topsun.proofing.service.BomService;
+import com.huigou.topsun.technology.application.TechnologyApplication;
+import com.huigou.topsun.technology.application.TechnologyProcessApplication;
+import com.huigou.topsun.technology.domain.model.Technology;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.client.CommonController;
@@ -17,6 +20,7 @@ import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +37,17 @@ public class ProofingApplyController extends CommonController {
     private BomService bomService;
     @Autowired
     ProofingApplyApplication proofingApplyApplication;
+    @Autowired
+    TechnologyApplication technologyApplication;
 
+    @Resource
+    private TechnologyProcessApplication technologyProcessApplication;
 
+    public String slicedTechnologyProcessList(){
+        SDO sdo = this.getSDO();
+        String technologyId = sdo.getString("technologyId");
+        return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
+    }
     /**
      * 打样表单页
      * @return
@@ -53,19 +66,13 @@ public class ProofingApplyController extends CommonController {
         return forward("proofingApply",proofingApply);
     }
 
-    public String forwardAddBom(){
-        //如果有id的话就带参数过去
+    public String slicedTechnologyList(){
         SDO sdo = this.getSDO();
-        String id = sdo.getId();
-//        BomVo bom = bomService.getBomVoById(Long.valueOf(id));
-        return forward("BomDetail");
-    }
-
-    public String addProofingApply(){
-        SDO sdo = this.getSDO();
-//        ResourceTypeVo resourceTypeVo = sdo.toObject(ResourceTypeVo.class);
-//        sampleService.getProductNoList();
-        return toResult(1);
+        String productId = sdo.getString("productId");
+        List<Technology> allByProduct= technologyApplication.findAllByProductId(productId);
+        Map<String,Object> map =new HashMap();
+        map.put("Rows",allByProduct);
+        return toResult(map);
     }
 
 

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java

@@ -48,8 +48,11 @@ public class ProofingMakeController extends CommonController {
         return toResult(map);
     }
 
-    //跳转打样编辑页
+    /**
+     *    跳转打样编辑页
+     */
     public String forwardSaveProofingMake(){
+        this.putAttribute("bizId", "ProofingMakeId");
         //如果有id的话就带参数过去
         SDO sdo = this.getSDO();
         String id = sdo.getId();

topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstrcutionApply.java

+package com.huigou.topsun.proofing.domain.model;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.Data;
+
+/**
+ * 作业指导申请书
+ * @TableName work_instrcution_apply
+ */
+@Table(name="work_instrcution_apply")
+@Data
+public class WorkInstrcutionApply implements Serializable {
+    /**
+     * 作业指导申请书id
+     */
+    @Id
+    @Column(name = "work_instrcution_apply_id")
+    private String workInstrcutionApplyId;
+
+    /**
+     * 打样制作单id
+     */
+    @Column(name = "proofing_make_id")
+    private String proofingMakeId;
+
+    /**
+     * 规格书编号
+     */
+    @Column(name = "specification_no")
+    private String specificationNo;
+
+    /**
+     * 换算值
+     */
+    @Column(name = "matrixing_value")
+    private Integer matrixingValue;
+
+    /**
+     * 尺码组
+     */
+    @Column(name = "size_group")
+    private String sizeGroup;
+
+    /**
+     * 是否禁用
+     */
+    @Column(name = "is_disable")
+    private String isDisable;
+
+    /**
+     * 是否创建新规格书
+     */
+    @Column(name = "is_new_specification")
+    private String isNewSpecification;
+
+    /**
+     * 是否要鞋图
+     */
+    @Column(name = "is_shoe_pattern")
+    private String isShoePattern;
+
+    /**
+     * 是否附样品
+     */
+    @Column(name = "is_attached_sample")
+    private String isAttachedSample;
+
+    /**
+     * 是否为唯一码产品
+     */
+    @Column(name = "is_only_code")
+    private String isOnlyCode;
+
+    /**
+     * 是否不考虑形体配色
+     */
+    @Column(name = "is_body_color")
+    private String isBodyColor;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java

 package com.huigou.topsun.proofing.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.huigou.data.domain.model.FlowBillAbstractEntity;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -188,6 +191,65 @@ public class ProofingMakeVo{
     @Column(name = "die_board_num")
     private Integer dieBoardNum;
 
+    //产品打样排版参数方面字段
+    /**
+     * 模数
+     */
+    @Column(name = "modulus")
+    private Integer modulus;
+
+    /**
+     * 行数
+     */
+    @Column(name = "row_num")
+    private Integer rowNum;
+
+    /**
+     * 列数
+     */
+    @Column(name = "column_num")
+    private Integer columnNum;
+
+    /**
+     * 搭版数
+     */
+    @Column(name = "contact_num")
+    private Integer contactNum;
+
+    /**
+     * 行双刀位(单位mm)
+     */
+    @Column(name = "row_double_blade")
+    private Double rowDoubleBlade;
 
+    /**
+     * 列双刀位(单位mm)
+     */
+    @Column(name = "column_double_blade")
+    private Double columnDoubleBlade;
+
+    /**
+     * 派工倍数
+     */
+    @Column(name = "dispatch_multiple")
+    private Integer dispatchMultiple;
+
+    /**
+     * 印张长度(单位cm)
+     */
+    @Column(name = "sheet_length")
+    private Double sheetLength;
+
+    /**
+     * 印张宽度(单位cm)
+     */
+    @Column(name = "sheet_width")
+    private Double sheetWidth;
+
+    /**
+     * 产品印张设置(product_sheet_conf)
+     */
+    @Column(name = "product_sheet_conf")
+    private String productSheetConf;
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/WorkInstrcutionApplyVo.java

+package com.huigou.topsun.proofing.domain.vo;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 作业指导申请书
+ * @TableName work_instrcution_apply
+ */
+@Table(name="work_instrcution_apply")
+@Data
+public class WorkInstrcutionApplyVo implements Serializable {
+    /**
+     * 作业指导申请书id
+     */
+    @Id
+    @Column(name = "work_instrcution_apply_id")
+    private String workInstrcutionApplyId;
+
+    /**
+     * 打样制作单id
+     */
+    @Column(name = "proofing_make_id")
+    private String proofingMakeId;
+
+    /**
+     * 产品id
+     */
+    @Column(name = "product_id")
+    private String productId;
+
+
+
+    /**
+     * 规格书编号
+     */
+    @Column(name = "specification_no")
+    private String specificationNo;
+
+    /**
+     * 换算值
+     */
+    @Column(name = "matrixing_value")
+    private Integer matrixingValue;
+
+    /**
+     * 尺码组
+     */
+    @Column(name = "size_group")
+    private String sizeGroup;
+
+    /**
+     * 是否禁用
+     */
+    @Column(name = "is_disable")
+    private String isDisable;
+
+    /**
+     * 是否创建新规格书
+     */
+    @Column(name = "is_new_specification")
+    private String isNewSpecification;
+
+    /**
+     * 是否要鞋图
+     */
+    @Column(name = "is_shoe_pattern")
+    private String isShoePattern;
+
+    /**
+     * 是否附样品
+     */
+    @Column(name = "is_attached_sample")
+    private String isAttachedSample;
+
+    /**
+     * 是否为唯一码产品
+     */
+    @Column(name = "is_only_code")
+    private String isOnlyCode;
+
+    /**
+     * 是否不考虑形体配色
+     */
+    @Column(name = "is_body_color")
+    private String isBodyColor;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java

 package com.huigou.topsun.proofing.service.impl;
 
 import com.huigou.topsun.product.domain.ProductLooked;
+import com.huigou.topsun.product.domain.ProductPublishedConf;
 import com.huigou.topsun.product.repository.ProductLookedRepository;
+import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.model.ProofingMake;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
@@ -27,6 +29,9 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
     ProofingApplyRepository proofingApplyRepository;
     @Autowired
     ProductLookedRepository productLookedRepository;
+    @Autowired
+    ProductPublishedConfRepository productPublishedConfRepository;
+
 
 
     public List<ProofingMakeVo> getProofingMakeVoList(){
@@ -34,6 +39,7 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
         return makeAll.stream().map(proofingMake -> {
                     ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
                     ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
+//                    ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
                     return this.getProofingMakeVo(proofingMake,proofingApply,productLooked);
                 })
                 .collect(Collectors.toList());
@@ -44,7 +50,8 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
         ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
         ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
         ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
-        return this.getProofingMakeVo(proofingApply,proofingMake,productLooked);
+        ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
+        return this.getProofingMakeVo(proofingApply,proofingMake,productLooked,productPublishedConf);
     }
 
     /**
@@ -67,8 +74,6 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
 
     /**
      *   生成ProofingMakeVo类
-//     * @param proofingMake
-//     * @param proofingApply
      * @return 填充过数据后的ProofingMakeVo
      */
     public ProofingMakeVo getProofingMakeVo(Object... objs){

topsun/src/main/java/com/huigou/topsun/technology/application/TechnologyApplication.java

@@ -5,7 +5,6 @@ import com.huigou.topsun.technology.domain.model.Technology;
 import com.huigou.topsun.technology.domain.query.TechnologyQueryRequest;
 import com.huigou.topsun.technology.vo.TechnologyVo;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,4 +25,7 @@ public interface TechnologyApplication {
     void deleteTechnology(List<String> ids);
 
     TechnologyVo findTechnologyByTechnologyIdId(String technologyId);
+
+    List<Technology> findAllByProductId(String productId);
+
 }

topsun/src/main/java/com/huigou/topsun/technology/application/impl/TechnologyApplicationImpl.java

@@ -71,6 +71,11 @@ public class TechnologyApplicationImpl extends BaseApplication implements Techno
         Technology technology = technologyRepository.findOne(technologyId);
         return TechnologyVo.getTechnologyVo(technology);
     }
+
+    @Override
+    public List<Technology> findAllByProductId(String productId) {
+        return technologyRepository.findAllByProductId(productId);
+    }
 }
 
 

topsun/src/main/java/com/huigou/topsun/technology/repository/TechnologyRepository.java

@@ -3,10 +3,14 @@ package com.huigou.topsun.technology.repository;
 import com.huigou.topsun.technology.domain.model.Technology;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * @Auther: xin.lu
  * @Date: 2023/11/22/11:12
  * @Description:
  */
 public interface TechnologyRepository extends JpaRepository<Technology,String> {
+
+    List<Technology> findAllByProductId(String productId);
 }

topsun/src/main/resources/mapper/WorkInstrcutionApplyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="generator.mapper.WorkInstrcutionApplyMapper">
+
+    <resultMap id="BaseResultMap" type="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+            <id property="workInstrcutionApplyId" column="work_instrcution_apply_id" jdbcType="VARCHAR"/>
+            <result property="proofingMakeId" column="proofing_make_id" jdbcType="VARCHAR"/>
+            <result property="specificationNo" column="specification_no" jdbcType="VARCHAR"/>
+            <result property="matrixingValue" column="matrixing_value" jdbcType="INTEGER"/>
+            <result property="sizeGroup" column="size_group" jdbcType="VARCHAR"/>
+            <result property="isDisable" column="is_disable" jdbcType="CHAR"/>
+            <result property="isNewSpecification" column="is_new_specification" jdbcType="CHAR"/>
+            <result property="isShoePattern" column="is_shoe_pattern" jdbcType="CHAR"/>
+            <result property="isAttachedSample" column="is_attached_sample" jdbcType="CHAR"/>
+            <result property="isOnlyCode" column="is_only_code" jdbcType="CHAR"/>
+            <result property="isBodyColor" column="is_body_color" jdbcType="CHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        work_instrcution_apply_id,proofing_make_id,specification_no,
+        matrixing_value,size_group,is_disable,
+        is_new_specification,is_shoe_pattern,is_attached_sample,
+        is_only_code,is_body_color
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from work_instrcution_apply
+        where  work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from work_instrcution_apply
+        where  work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </delete>
+    <insert id="insert" keyColumn="work_instrcution_apply_id" keyProperty="workInstrcutionApplyId" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply" useGeneratedKeys="true">
+        insert into work_instrcution_apply
+        ( work_instrcution_apply_id,proofing_make_id,specification_no
+        ,matrixing_value,size_group,is_disable
+        ,is_new_specification,is_shoe_pattern,is_attached_sample
+        ,is_only_code,is_body_color)
+        values (#{workInstrcutionApplyId,jdbcType=VARCHAR},#{proofingMakeId,jdbcType=VARCHAR},#{specificationNo,jdbcType=VARCHAR}
+        ,#{matrixingValue,jdbcType=INTEGER},#{sizeGroup,jdbcType=VARCHAR},#{isDisable,jdbcType=CHAR}
+        ,#{isNewSpecification,jdbcType=CHAR},#{isShoePattern,jdbcType=CHAR},#{isAttachedSample,jdbcType=CHAR}
+        ,#{isOnlyCode,jdbcType=CHAR},#{isBodyColor,jdbcType=CHAR})
+    </insert>
+    <insert id="insertSelective" keyColumn="work_instrcution_apply_id" keyProperty="workInstrcutionApplyId" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply" useGeneratedKeys="true">
+        insert into work_instrcution_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="workInstrcutionApplyId != null">work_instrcution_apply_id,</if>
+                <if test="proofingMakeId != null">proofing_make_id,</if>
+                <if test="specificationNo != null">specification_no,</if>
+                <if test="matrixingValue != null">matrixing_value,</if>
+                <if test="sizeGroup != null">size_group,</if>
+                <if test="isDisable != null">is_disable,</if>
+                <if test="isNewSpecification != null">is_new_specification,</if>
+                <if test="isShoePattern != null">is_shoe_pattern,</if>
+                <if test="isAttachedSample != null">is_attached_sample,</if>
+                <if test="isOnlyCode != null">is_only_code,</if>
+                <if test="isBodyColor != null">is_body_color,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="workInstrcutionApplyId != null">#{workInstrcutionApplyId,jdbcType=VARCHAR},</if>
+                <if test="proofingMakeId != null">#{proofingMakeId,jdbcType=VARCHAR},</if>
+                <if test="specificationNo != null">#{specificationNo,jdbcType=VARCHAR},</if>
+                <if test="matrixingValue != null">#{matrixingValue,jdbcType=INTEGER},</if>
+                <if test="sizeGroup != null">#{sizeGroup,jdbcType=VARCHAR},</if>
+                <if test="isDisable != null">#{isDisable,jdbcType=CHAR},</if>
+                <if test="isNewSpecification != null">#{isNewSpecification,jdbcType=CHAR},</if>
+                <if test="isShoePattern != null">#{isShoePattern,jdbcType=CHAR},</if>
+                <if test="isAttachedSample != null">#{isAttachedSample,jdbcType=CHAR},</if>
+                <if test="isOnlyCode != null">#{isOnlyCode,jdbcType=CHAR},</if>
+                <if test="isBodyColor != null">#{isBodyColor,jdbcType=CHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+        update work_instrcution_apply
+        <set>
+                <if test="proofingMakeId != null">
+                    proofing_make_id = #{proofingMakeId,jdbcType=VARCHAR},
+                </if>
+                <if test="specificationNo != null">
+                    specification_no = #{specificationNo,jdbcType=VARCHAR},
+                </if>
+                <if test="matrixingValue != null">
+                    matrixing_value = #{matrixingValue,jdbcType=INTEGER},
+                </if>
+                <if test="sizeGroup != null">
+                    size_group = #{sizeGroup,jdbcType=VARCHAR},
+                </if>
+                <if test="isDisable != null">
+                    is_disable = #{isDisable,jdbcType=CHAR},
+                </if>
+                <if test="isNewSpecification != null">
+                    is_new_specification = #{isNewSpecification,jdbcType=CHAR},
+                </if>
+                <if test="isShoePattern != null">
+                    is_shoe_pattern = #{isShoePattern,jdbcType=CHAR},
+                </if>
+                <if test="isAttachedSample != null">
+                    is_attached_sample = #{isAttachedSample,jdbcType=CHAR},
+                </if>
+                <if test="isOnlyCode != null">
+                    is_only_code = #{isOnlyCode,jdbcType=CHAR},
+                </if>
+                <if test="isBodyColor != null">
+                    is_body_color = #{isBodyColor,jdbcType=CHAR},
+                </if>
+        </set>
+        where   work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+        update work_instrcution_apply
+        set 
+            proofing_make_id =  #{proofingMakeId,jdbcType=VARCHAR},
+            specification_no =  #{specificationNo,jdbcType=VARCHAR},
+            matrixing_value =  #{matrixingValue,jdbcType=INTEGER},
+            size_group =  #{sizeGroup,jdbcType=VARCHAR},
+            is_disable =  #{isDisable,jdbcType=CHAR},
+            is_new_specification =  #{isNewSpecification,jdbcType=CHAR},
+            is_shoe_pattern =  #{isShoePattern,jdbcType=CHAR},
+            is_attached_sample =  #{isAttachedSample,jdbcType=CHAR},
+            is_only_code =  #{isOnlyCode,jdbcType=CHAR},
+            is_body_color =  #{isBodyColor,jdbcType=CHAR}
+        where   work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </update>
+</mapper>