填充字段

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

@@ -154,10 +154,10 @@ function loadProofingApplyListGrid() {
 }
 
 function query(obj) {
+    debugger
     var param = $(obj).formToJSON();
     UICtrl.gridSearch(gridManager, param);
 }
-
 function reloadGrid() {
     gridManager.loadData();
 }
@@ -166,50 +166,6 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
-// function addHandler() {
-//     UICtrl.showAjaxDialog({
-//         url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
-//         title: "新增打样制造单",
-//         width: 1000,
-//         ok: function (div) {
-//             var _self = this;
-//             $('#submitForm', div).ajaxSubmit({
-//                 url: web_app.name + '/proofingMake/saveProofingMake.ajax',
-//                 success: function () {
-//                     _self.close();
-//                     reloadGrid();
-//                 }
-//             });
-//         }
-//     });
-// }
-
-// function updateHandler(proofingMakeId) {
-//     if (!proofingMakeId) {
-//         console.log(gridManager)
-//         //获取所选行id
-//         proofingMakeId = DataUtil.getUpdateRowId(gridManager);
-//         if (!proofingMakeId) {
-//             return;
-//         }
-//     }
-//     UICtrl.showAjaxDialog({
-//         url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
-//         title: "修改打样制造单",
-//         width: 1000,
-//         param: {id: proofingMakeId},
-//         ok: function (div) {
-//             var _self = this;
-//             $('#submitForm', div).ajaxSubmit({
-//                 url: web_app.name + '/proofingMake/saveProofingMake.ajax',
-//                 success: function () {
-//                     _self.close();
-//                     reloadGrid();
-//                 }
-//             });
-//         }
-//     });
-// }
 
 //重写DataUtil的getUpdateRowId函数、它默认取行的id列
 DataUtil.getUpdateRowId = function (gridManager) {

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

@@ -16,7 +16,7 @@
         <div position="center" title="打样申请查询">
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="ruleKind" required="false" label="申请单号" labelCol="1"/>
+                <x:inputC name="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

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

@@ -16,7 +16,7 @@
         <div position="center" title="打样制造">
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="ruleKind" required="false" label="制造单号" labelCol="1"/>
+                <x:inputC name="proofingMakeNo" required="false" label="制造单号" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

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

@@ -42,9 +42,9 @@
                           fieldCol="2"/>
                 <x:inputC name="sizeGroupId"  label="尺码组" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="isOnlyCode"  label="唯一码产品" maxLength="32" labelCol="1"
+                <x:selectC name="isOnlyCode"  label="唯一码产品" dictionary="yesorno" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="isBodyColor"  label="不考虑形体配色" maxLength="32" labelCol="1"
+                <x:selectC name="isBodyColor"  label="不考虑形体配色" dictionary="yesorno" labelCol="1"
                           fieldCol="2"/>
                 <x:selectC name="isDisable"  label="是否禁用" dictionary="yesorno" labelCol="1"
                           fieldCol="2"/>
@@ -65,7 +65,7 @@
                           fieldCol="2"/>
                 <x:inputC name="fileNo"  label="存档编号" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="barnd"  label="品牌" maxLength="32" labelCol="1"
+                <x:inputC name="brand"  label="品牌" maxLength="32" labelCol="1"
                           fieldCol="2"/>
             </div>
             <x:title title="可选属性" name="group"/>
@@ -117,11 +117,11 @@
                           fieldCol="2"/>
                 <x:inputC name="productSysCertification"  label="体系认证" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="storeName"  label="仓库" maxLength="32" labelCol="1"
+                <x:selectC name="storeHouse"  label="仓库"  labelCol="1" dictionary="storeName"
                            fieldCol="2"/>
                 <x:inputC name="productBuyUnit"  label="单位" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="isBodyColor"  label="采购换算值" maxLength="32" labelCol="1"
+                <x:inputC name="matrixingValue"  label="采购换算值" maxLength="32" labelCol="1"
                           fieldCol="2"/>
                 <x:inputC name="isBodyColor"  label="系数" maxLength="32" labelCol="1"
                           fieldCol="2"/>

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

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

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

@@ -18,6 +18,7 @@ function loadWorkInstructionApplyListGrid() {
     });
     gridManager = UICtrl.grid("#workInstructionApplyTableGrid", {
         columns: [
+            {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"},

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

@@ -16,7 +16,7 @@
         <div position="center" title="作业申请书">
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="ruleKind" required="false" label="作业指导申请书" labelCol="1"/>
+                <x:inputC name="workInstructionApplyId" required="false" label="作业指导申请书" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

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

@@ -16,7 +16,7 @@
         <div position="center" title="作业指导书">
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="ruleKind" required="false" label="作业指导书" labelCol="1"/>
+                <x:inputC name="workInstructionBaseInfoId" required="false" label="作业指导书" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyQuery.java

 package com.huigou.topsun.proofing.domain.proofingApply.query;
 
 import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
+import com.topsunit.query.annotations.Dictionary;
+import lombok.Data;
 
+import javax.persistence.Column;
+import java.util.Date;
+
+@Data
 public class ProofingApplyQuery extends FlowBillSuperQueryRequest {
+    /**
+     * 申请单id
+     */
+    private String proofingApplyId;
+
+    /**
+     * 申请单号
+     */
+
+    private String proofingApplyNo;
+
+    /**
+     * 产品id
+     */
+
+    private String productCode;
+
+    /**
+     * 产品id
+     */
+
+    private String productId;
+
+    /**
+     * 品牌客户编号
+     */
+
+    private String customerCode;
+
+    /**
+     * 客户id
+     */
+
+    private String customerId;
+
+    /**
+     * 版面
+     */
+    private String page;
+
+    /**
+     * 版面需求时间
+     */
+
+    private Date proofingApplyPageNeedTime;
+
+    /**
+     * 完成日期
+     */
+
+    private Date proofingApplyCompleteDate;
+
+    /**
+     * 样品中文名称
+     */
+
+    private String proofingApplySampleCnName;
+
+    /**
+     * 样品英文名称
+     */
+
+    private String proofingApplySampleEnName;
+
+    /**
+     * 样品版次
+     */
+
+    private Integer proofingApplySampleVersion;
+
+    /**
+     * 样品规格
+     */
+
+    private Integer proofingApplySampleSize;
+
+    /**
+     * 样品数量
+     */
+
+    private Long proofingApplySampleNum;
+
+    /**
+     * 产量情况
+     */
+
+    private String proofingApplyOutputSituation;
+
+    /**
+     * 产品代号
+     */
+
+    private String proofingApplyProductNo;
+
+    /**
+     * 打样形式
+     */
+
+    private String proofingType;
+
+    /**
+     * 分配方式
+     */
+
+    private String proofingApplyAllocationType;
+
+    /**
+     * 产品类别名称
+     */
+
+    private String productCategoryName;
+
+    /**
+     * 表面处理
+     */
+
+    private String proofingApplySurfaceTreatment;
+
+    /**
+     * NG重新打样原因
+     */
+
+    private String proofingApplyNgReReason;
+
+    /**
+     * 申请单状态
+     */
+
+    private String proofingApplyApplicationStatus;
+
+    /**
+     * 测试标准
+     */
+
+    private String proofingApplyTestStandard;
 
 }

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

@@ -110,7 +110,7 @@ public class WorkInstructionVo {
     /**
      * 品牌
      */
-    private String barnd;
+    private String brand;
 
 
     private String workInstructionMaterialInfoId;

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

@@ -140,7 +140,7 @@ public class WorkInstructionBaseInfo implements Serializable {
     /**
      * 品牌
      */
-    private String barnd;
+    private String brand;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/query/WorkInstructionBaseInfoQueryRequest.java

@@ -117,6 +117,6 @@ public class WorkInstructionBaseInfoQueryRequest extends QueryAbstractRequest {
     /**
      * 品牌
      */
-    private String barnd;
+    private String brand;
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/util/MyBaseUtil.java

@@ -60,7 +60,7 @@ public class MyBaseUtil {
         WorkInstructionMaterialInfo workInstructionMaterialInfo = new WorkInstructionMaterialInfo();
         workInstructionMaterialInfo.setBomNo("hhhh");
         WorkInstructionBaseInfo workInstructionBaseInfo = new WorkInstructionBaseInfo();
-        workInstructionBaseInfo.setBarnd("wwwwww");
+        workInstructionBaseInfo.setBrand("wwwwww");
 
         MyBaseUtil.mergeObjects(workInstructionVo, workInstructionMaterialInfo, workInstructionBaseInfo,null);
 

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

@@ -28,16 +28,6 @@
 
     <easy-search name="productDetail" desc="产品详情">
         <sql>
-<!--            SELECT-->
-<!--            p.product_code,p.product_name, pc.product_category_name,pl.*,-->
-<!--            ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf,-->
-<!--            pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name-->
-<!--            FROM product p-->
-<!--            LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id-->
-<!--            LEFT JOIN product_detail pd ON pd.product_id = p.product_id-->
-<!--            LEFT JOIN product_looked pl ON pl.product_id = p.product_id-->
-<!--            LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id-->
-<!--            LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id-->
             SELECT
             pi.*,p.product_name,p.product_status,p.product_unit,p.brand_name,
             p.is_build_bom, p.confirm_date,
@@ -46,7 +36,7 @@
             pd.product_english_name,
             wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group,
             wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
-            wa.is_attached_sample, wa.is_only_code, wa.is_body_color,
+            wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_house,
             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,
@@ -81,8 +71,8 @@
         <field name="库存编码" title="库存编码" code="stockNo" width="200" type='hidden'/>
         <field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
         <field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
-        <field name="品牌" title="品牌" code="barnd" 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="proofingMakeNo" width="200"/>
         <field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
@@ -99,8 +89,9 @@
         <field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/>
         <field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
         <field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
-        <field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
+
         <field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/>
+
         <field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
         <field name="模数" title="模数" code="modulus" width="200" type='hidden'/>
         <field name="行数" title="行数" code="rowNum" width="200" type='hidden'/>

topsun/src/main/resources/config/topsun/proofing/proofingApply.xml

@@ -4,9 +4,10 @@
     <query name="slicedQuery" table="proofing_apply">
         <sql-query>
             select t.* from proofing_apply_base_info t
-<!--            where 1=1-->
+            where 1=1
         </sql-query>
 <!--        <permissions>-->
+            <condition column="proofing_apply_No" name="proofingApplyNo" type="java.lang.String" symbol="like" alias="t"/>
 <!--            <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>-->
 <!--            <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>-->
 <!--        </permissions>-->

topsun/src/main/resources/config/topsun/proofing/proofingMake.xml

@@ -9,6 +9,7 @@
             proofing_make_base_info pm
             where pm.is_delete = 0
         </sql-query>
+        <condition column="proofing_make_no" name="proofingMakeNo" type="java.lang.String" symbol="like" alias="pm"/>
     </query>
     <query name="slicedProofingMakeTechnology" table="proofing_Make_technology">
         <sql-query>

topsun/src/main/resources/config/topsun/proofing/workInstruction.xml

@@ -7,6 +7,8 @@
                 wi.*
                 FROM
                 work_instruction_base_info wi
+                where 1=1
             </sql-query>
+            <condition column="work_instruction_base_info_id" name="workInstructionBaseInfoId" type="java.lang.String" symbol="like" alias="wi"/>
         </query>
 </query-mappings>
\ No newline at end of file

topsun/src/main/resources/config/topsun/proofing/workInstructionApply.xml

@@ -11,5 +11,6 @@
                 on wa.proofing_make_id= pi.proofing_make_id
                 where wa.is_delete = 0 and pi.is_delete=0
             </sql-query>
+            <condition column="work_instruction_apply_id" name="workInstructionApplyId" type="java.lang.String" symbol="like" alias="wa"/>
         </query>
 </query-mappings>
\ No newline at end of file