填充数据

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

@@ -117,7 +117,7 @@
                           fieldCol="2"/>
                 <x:inputC name="productSysCertification"  label="体系认证" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:selectC name="storeHouse"  label="仓库"  labelCol="1" dictionary="storeName"
+                <x:selectC name="storeName"  label="仓库"  labelCol="1" dictionary="storeName"
                            fieldCol="2"/>
                 <x:inputC name="productBuyUnit"  label="单位" maxLength="32" labelCol="1"
                           fieldCol="2"/>
@@ -197,7 +197,7 @@
                 <x:inputC name="riskDescription"  label="风险描述（序号、内容、等级）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
                 <x:selectC name="haveDrawing"  label="是否附样图" dictionary="yesorno" labelCol="1" fieldCol="2"/>
-                <x:selectC name="isBodyColor"  label="是否要鞋图" dictionary="yesorno" labelCol="1"
+                <x:selectC name="isShoePattern"  label="是否要鞋图" dictionary="yesorno" labelCol="1"
                           fieldCol="2"/>
                 <x:inputC name="beerPlateNum"  label="啤版模数" maxLength="32" labelCol="1"
                           fieldCol="2"/>

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

@@ -42,9 +42,9 @@
                           fieldCol="2"/>
                 <x:inputC name="productEnName"  label="产品英文名称" maxLength="32" labelCol="2"
                           fieldCol="2"/>
-                <x:selectC name="storeHouse"  label="仓库"  labelCol="2" dictionary="storeName"
+                <x:selectC name="storeName"  label="仓库"  labelCol="2" dictionary="storeName"
                           fieldCol="2"/>
-                <x:inputC name="sizeGroup"  label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/>
+                <x:inputC name="sizeGroupId"  label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/>
                 <x:selectC name="isDisable"  label="是否禁用" dictionary="yesorno" labelCol="2" fieldCol="2"/>
 
                 <x:selectC name="isNewSpecification" label="是否创建新规格书" dictionary="yesorno" labelCol="2" fieldCol="2"/>

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

@@ -21,7 +21,7 @@ function loadWorkInstructionApplyListGrid() {
             {display: "指导申请书编号", name: "workInstructionApplyId", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "规格书编号", name: "specificationNo", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "换算值", name: "matrixingValue", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "尺码组", name: "sizeGroup", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "尺码组", name: "sizeGroupId", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "是否禁用", name: "isDisableTextView", width: 140, minWidth: 60, type: "string", align: "left"}
          ],
         dataAction: "server",

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

@@ -533,6 +533,10 @@ public class WorkInstructionVo {
      * 采购单位(product_buy_unit)
      */
     private String productBuyUnit;
+    /**
+     * 换算值
+     */
+    private String matrixingValue;
 
     /**
      * 产品lossID

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionPrdLooked.java

@@ -123,6 +123,11 @@ public class WorkInstructionPrdLooked implements Serializable {
      */
     @Column(name = "product_buy_unit")
     private String productBuyUnit;
+    /**
+     * 换算值
+     */
+    @Column(name = "matrixing_value")
+    private String matrixingValue;
 
     /**
      * 作业指导书id

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstructionApply/model/WorkInstructionApply.java

@@ -84,14 +84,14 @@ public class WorkInstructionApply implements Serializable {
     /**
      * 仓库
      */
-    @Column(name = "store_house")
-    private String storeHouse;
+    @Column(name = "store_name")
+    private String storeName;
 
     /**
      * 尺码组
      */
-    @Column(name = "size_group")
-    private String sizeGroup;
+    @Column(name = "size_group_id")
+    private String sizeGroupId;
 
     /**
      * 是否禁用

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstructionApply/query/WorkInstructionApplyQueryRequest.java

@@ -37,7 +37,7 @@ public class WorkInstructionApplyQueryRequest extends QueryAbstractRequest {
      * 尺码组
      */
 
-    private String sizeGroup;
+    private String sizeGroupId;
 
     /**
      * 是否禁用

topsun/src/main/resources/config/content/easysearch/easy-search-product.xml

@@ -34,9 +34,9 @@
             p.comfirm_person, p.is_free_inspection, p.is_no_quality_loss, p.sample_order_no,
             p.stock_no, p.stock_name, p.file_no,
             pd.product_english_name,
-            wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group,
+            wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group_id,
             wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
-            wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_house,
+            wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_name,
             pl.proofing_make_looked_id, pl.is_output, pl.is_out, pl.is_change,
             pl.plastic_bag_structure, pl.product_length, pl.product_width, pl.product_height,
             pl.product_thick, pl.product_single_layer, pl.product_layer_num, pl.sample_shape,
@@ -62,7 +62,10 @@
         <field name="不考虑形体配色" title="不考虑形体配色" code="isBodyColor" width="200" type='hidden'/>
         <field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
         <field name="是否禁用" title="是否禁用" code="isDisable" width="200" type='hidden'/>
+        <field name="是否创建新作业指导书" title="是否创建新作业指导书" code="isNewSpecification" width="200" type='hidden'/>
         <field name="是否建立BON表" title="是否建立BON表" code="isBuildBom" width="200" type='hidden'/>
+        <field name="是否要鞋图" title="是否要鞋图" code="isShoePattern" width="200" type='hidden'/>
+        <field name="是否附样品" title="是否附样品" code="isAttachedSample" width="200" type='hidden'/>
         <field name="确认日期" title="确认日期" code="confirmDate" width="200" type='hidden'/>
         <field name="确认人" title="确认人" code="comfirmPerson" width="200" type='hidden'/>
         <field name="是否免检" title="是否免检" code="isFreeInspection" width="200" type='hidden'/>
@@ -72,7 +75,9 @@
         <field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
         <field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
         <field name="品牌" title="品牌" code="brand" width="200" type='hidden'/>
-        <field name="仓库" title="仓库" code="storeHouse" width="200" type='hidden'/>
+        <field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
+        <field name="尺码组" title="尺码组" code="sizeGroupId" width="200" type='hidden'/>
+        <field name="采购换算值" title="采购换算值" code="matrixingValue" width="200" type='hidden'/>
 
         <field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
         <field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>