细化

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

@@ -11,10 +11,9 @@ function bindQueryEvent() {
         type: "product",
         name: "productCode",
         onChange: function (value, data) {
-            $('#productId').val(data.productId);
-            $('#productCategoryName').val(data.productCategoryName);
-            $('#customerId').val(data.productCategoryName);
-            renderDataGoForm(data.productId);
+            Public.ajax(web_app.name + '/proofingApply/queryProductLooked.ajax',{productId:data.productId},function (newData){
+                $('#submitForm').formSet(newData);
+            })
             showTechnologyTable(data.productId);
         }
     });
@@ -38,31 +37,3 @@ function getId() {
 }
 
 
-/**
- * 根据申请单号发送ajax请求并渲染进表单
- * @param proofingApplyNo
- */
-function renderDataGoForm(productId) {
-    $.ajax(
-        {
-            type: "POST",
-            url: web_app.name + '/proofingApply/queryProductLooked.ajax',
-            cache: false,
-            async: true,
-            dataType: "json",
-            data: {productId: productId},
-            success: function (data) {
-                let form = $('#submitForm');
-                $.each(data.data, function (key, value) {
-                    let field = form.find('[name="' + key + '"]');
-                    if (field.length > 0) {
-                        field.val(value);
-                    }
-                });
-            },
-            error: function (err) {
-                alert("异常：" + err)
-            }
-        })
-
-}

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

@@ -7,9 +7,10 @@
 <x:script src='/biz/topsun/proofing/proofingApply.js'/>
 <x:script src='/biz/topsun/proofing/technologyAndBom/technologyAndBom.js'/>
 <div class="container-fluid" style="padding: 10px;">
-    <div style="text-align: center;font-weight: bold;">
-        <h1 style="font-weight: bold;">打样申请单</h1>
-    </div>
+    <x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
+
+    <x:billTitle title="打样申请单" needStatus="false" needPerson="true"/>
+    <div class="blank_div clearfix"></div>
     <form class="hg-form" method="post" action="" id="submitForm">
         <x:hidden name="id" id="proofingApplyId"/>
         <x:hidden name="billCode"/>

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

@@ -231,10 +231,10 @@ function deleteHandler() {
     });
 }
 
-function doView(proofingApplyId) {
+function doView(id) {
     UICtrl.addTabItem({
-        tabid: 'proofingApply'+proofingApplyId,
-        text: "详情",
-        url: web_app.name + '/proofingApply/showProofingApply.job?bizId='+proofingApplyId
+        tabid: 'proofingApply'+id,
+        text: "打样单详情",
+        url: web_app.name + '/proofingApply/showProofingApply.job?bizId='+id
     });
 }
\ No newline at end of file

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

 $(document).ready(function () {
     //生成操作文件的窗口
-    // $('#proofingMakeDetail').fileList()
-    //                         .find('table').css({
-    //     borderTopWidth : 0
-    // });
     bindQueryEvent();
     $('#proofingMakeDetail').fileList();
     $('#proofingMakeDetail .col-xs-4').removeClass('col-sm-2');
     $('#proofingMakeDetail .col-xs-4').addClass('col-sm-3');
     $('#proofingMakeDetail .col-xs-8').removeClass('col-sm-10');
     $('#proofingMakeDetail .col-xs-8').addClass('col-sm-9');
-
+    initialize();
 });
 
+
+function initialize(){
+    /**
+     * 如果是详情页，展示数据，隐藏按钮
+     * @type {boolean}
+     */
+    let isDetailPage = ($("#isDetailPage").val() === "true");
+    if(isDetailPage){
+        let proofingApplyNo = $("#proofingApplyNo").val();
+        let productId = $("#productId").val();
+        if(proofingApplyNo!=null&& proofingApplyNo !== ''){
+            ajaxRenderDataGoForm(proofingApplyNo);
+        }
+        if(productId!=null&& productId !== ''){
+            showTechnologyTable(productId);
+        }
+        $("#formButton").hide();
+    }
+
+
+}
+
 //绑定selectC
 function bindQueryEvent() {
     $('#proofingApplyNo').searchbox({
         type: "proofing", name: "proofingApplyCode",
         onChange: function (value, data) {
-            $('#proofingApplyNo').val(data.proofingApplyNo);
-            renderDataGoForm(data.proofingApplyNo);
+            ajaxRenderDataGoForm(data.proofingApplyNo);
             showTechnologyTable(data.productId);
         }
     });
 }
 
 
-/**
- * 根据申请单号发送ajax请求并渲染进表单
- * @param proofingApplyNo
- */
-function renderDataGoForm(proofingApplyNo) {
-    $.ajax(
-        {
-            type: "POST",
-            url: web_app.name + '/proofingMake/queryProofingApply.ajax',
-            cache: false,
-            async: true,
-            dataType: "json",
-            data: {proofingApplyNo: proofingApplyNo},
-            success: function (data) {
-                let form = $('#submitForm');
-                $.each(data.data, function (key, value) {
-                    let field = form.find('[name="' + key + '"]');
-                    if (field.length > 0) {
-                        field.val(value);
-                    }
-                });
-            },
-            error: function (err) {
-                alert("异常：" + err)
-            }
-        })
-
-}
-
-
 function saveForm(){
     var _self=this;
     $('#submitForm').ajaxSubmit({
@@ -69,9 +56,22 @@ function saveForm(){
         }
     });
 
-    // UICtrl.addTabItem({
-    //     tabid: 'workInstrcutionApply',
-    //     text: "详情",
-    //     url: web_app.name + '/proofingMake/forwardDetailsProofingMake.do?id='+proofingMakeId
-    // });
+    let productId=$("#productId").val();
+    let proofingMakeNo=$("#proofingMakeNo").val();
+    UICtrl.addTabItem({
+        tabid: 'workInstrcutionApply'+proofingMakeNo,
+        text: "作业指导申请书",
+        url: web_app.name + '/workInstrcutionApply/forwardWorkInstrcutionApply.do?productId='+productId
+    });
+}
+
+
+function resetForm(obj) {
+    $(obj).formClean();
+}
+
+function ajaxRenderDataGoForm(proofingApplyNo){
+    Public.ajax(web_app.name + '/proofingMake/queryProofingApply.ajax',{proofingApplyNo:proofingApplyNo},function (data){
+        $('#submitForm').formSet(data);
+    })
 }
\ No newline at end of file

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

@@ -7,16 +7,15 @@
 <x:script src='/biz/topsun/proofing/proofingMake.js'/>
 <x:script src='/biz/topsun/proofing/technologyAndBom/technologyAndBom.js'/>
 <div class="container-fluid" style="padding: 10px;">
-    <div style="text-align: center;">
-        <h1 style="font-weight: bold;">打样制造单</h1>
-    </div>
+    <x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
+    <x:billTitle title="打样查询单" needStatus="false" needPerson="true"/>
+    <div class="blank_div clearfix"></div>
     <form class="hg-form" method="post" action="" id="submitForm">
         <div><h3>基本信息</h3></div>
         <div style="margin: 10px;">
             <div class="hg-form-cols">
                 <x:hidden name="proofingMakeId"/>
                 <x:hidden name="proofingApplyId"/><!--申请单id-->
-                <x:hidden name="id"/><!--申请单的主键id-->
 
                 <x:inputC name="proofingMakeNo" readonly="true" label="制造单号" labelCol="1" fieldCol="2"/>
 
@@ -151,9 +150,9 @@
 
         <%@ include file="technologyAndBom/technologyAndBom.jsp" %>
         <div class="blank_div clearfix"></div>
-        <div style="min-height: 40px; text-align: center;">
+        <div style="min-height: 40px; text-align: center;" id="formButton">
             <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
-            <x:button value="重置" onclick="" icon="fa-history"/>
+            <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
         </div>
     </form>
 </div>

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

@@ -243,10 +243,9 @@ function deleteHandler() {
 }
 
 function doView(proofingMakeId) {
-    debugger
     UICtrl.addTabItem({
         tabid: 'showProofingMake',
-        text: "详情",
-        url: web_app.name + '/proofingMake/forwardDetailsProofingMake.do?id='+proofingMakeId
+        text: "制造单详情",
+        url: web_app.name + '/proofingMake/forwardDetailsProofingMake.job?id='+proofingMakeId
     });
 }
\ No newline at end of file

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

@@ -68,7 +68,7 @@ function loadProofingApplyGrid(obj) {
 
 /**
  * 切换gridManager
- * 定义监听器、操作对应表格是自动切换
+ * 定义监听器、操作对应表格时自动切换
  */
 function switchGridManager() {
 	$("#technology").on("click", "*", function(event) {
@@ -120,11 +120,11 @@ function reloadGrid(parms) {
 
 /**
  * 根据选定的technology列获取对应的process
- * 根据冒泡机制，永远都会先执行此点击事件，需要让平台内置事件先执行来获取行id
+ * 冒泡机制永远都会先执行此点击事件，需要让平台内置事件先执行来获取行id
  */
 function technologyClickRequestProcess(){
 	$(document).on('click', '#technology .l-grid-row', function(event) {
-		// 延迟执行新创建的点击事件逻辑，确保在当前点击事件逻辑之后执行
+		// 延迟执行点击事件逻辑
 		setTimeout(function() {
 			let result = DataUtil.getUpdateRow(gridManager); // 获取选中行
 			processObj.parms = { technologyId: result.technologyId };

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

 $(document).ready(function () {
-
     bindQueryEvent();
 });
 
-
-function echo(node) {
-    $("#" + node + "_text").val($("#" + node).val())
-}
-
 //绑定selectC
 function bindQueryEvent() {
     $('#productId').searchbox({
         type: "proofing", name: "proofingMakeCode",
         onChange: function (value, data) {
-            $('#productId').val(data.productId);
-            renderDataGoForm(data.productId)
+            $('#submitForm').formSet(data);
         }
     });
 }
 
 
-
-/**
- * 根据申请单号发送ajax请求并渲染进表单
- * @param proofingApplyNo
- */
-function renderDataGoForm(productId) {
-    $.ajax(
-        {
-            type: "POST",
-            url: web_app.name + '/workInstrcutionApply/queryWorkInstrcutionApply.ajax',
-            cache: false,
-            async: true,
-            dataType: "json",
-            data: {productId: productId},
-            success: function (data) {
-                let form = $('#submitForm');
-                $.each(data.data, function (key, value) {
-                    let field = form.find('[name="' + key + '"]');
-                    if (field.length > 0) {
-                        field.val(value);
-                    }
-                });
-            },
-            error: function (err) {
-                alert("异常：" + err)
-            }
-        })
-}
-
 function saveForm(){
     var _self=this;
     $('#submitForm').ajaxSubmit({
@@ -63,3 +27,7 @@ function saveForm(){
         }
     });
 }
+
+function resetForm(obj) {
+    $(obj).formClean();
+}
\ No newline at end of file

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

@@ -4,31 +4,32 @@
 <x:base include="grid,date,layout,combox,tree,comboDialog,attachment"/>
 <x:script src='/system/opm/js/OpmUtil.js'/>
 <x:script src='/biz/topsun/common/purchaseCommon.js'/>
-<x:script src='/biz/topsun/proofing/proofingMake.js'/>
+<x:script src='/biz/topsun/proofing/workInstrcutionApply.js'/>
 <div class="container-fluid" style="padding: 10px;">
     <form class="hg-form" method="post" action="" id="submitForm">
         <div><h3>基本信息</h3></div>
         <div style="margin: 10px;">
             <div class="hg-form-cols">
-                <x:inputC name="workInstrcutionApplyId"  label="指导书编号" labelCol="2" fieldCol="2"/>
+                <x:hidden name="proofingApplyId"/>
+                <x:inputC name="workInstrcutionApplyId" readonly="true" label="指导书编号" labelCol="2" fieldCol="2"/>
 
-                <x:inputC name="productId"  label="产品编号" labelCol="2" fieldCol="2"/>
+                <x:inputC name="productId"  label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/>
 
                 <x:inputC name="specificationNo"  label="规格书编号" labelCol="2" fieldCol="2"/>
 
-                <x:inputC name="proofingApplyPageNeedTime"  label="产品类型" wrapper="date" labelCol="2"
+                <x:inputC name="productType"  label="产品类型"  labelCol="2"
                           fieldCol="2"/>
-                <x:inputC name="proofingApplySampleCnName"  label="品牌" maxLength="32" labelCol="2"
+                <x:inputC name="brandName"  label="品牌" maxLength="32" labelCol="2"
                           fieldCol="2"/>
                 <x:inputC name="proofingApplySampleEnName"  label="采购单位" maxLength="32" labelCol="2"
                           fieldCol="2"/>
                 <x:inputC name="proofingApplySampleVersion"  label="换算值" maxLength="32" labelCol="2"
                           fieldCol="2"/>
-                <x:inputC name="proofingApplySampleSize"  label="产品名称" maxLength="32" labelCol="2"
+                <x:inputC name="productName"  label="产品名称" maxLength="32" labelCol="2"
                           fieldCol="2"/>
-                <x:inputC name="proofingApplySampleNum"  label="产品英文名称" maxLength="32" labelCol="2"
+                <x:inputC name="productEnglishName"  label="产品英文名称" maxLength="32" labelCol="2"
                           fieldCol="2"/>
-                <x:inputC name="proofingApplyOutputSituation"  label="仓库" maxLength="32" labelCol="2"
+                <x:inputC name="storeName"  label="仓库" maxLength="32" labelCol="2"
                           fieldCol="2"/>
                 <x:inputC name="sizeGroup"  label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/>
                 <x:inputC name="isDisable"  label="是否禁用" labelCol="2" fieldCol="2"/>
@@ -45,11 +46,11 @@
                           fieldCol="2"/>
             </div>
         </div>
-
+        <div class="blank_div clearfix"></div>
+        <div style="min-height: 40px; text-align: center;">
+            <x:button value="保存" onclick="" icon="fa-save"/>
+            <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
+        </div>
     </form>
-    <div class="blank_div clearfix"></div>
-    <div style="min-height: 40px; text-align: center;">
-        <x:button value="保存" onclick="" icon="fa-save"/>
-        <x:button value="重置" onclick="" icon="fa-history"/>
-    </div>
+
 </div>

topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyApplication.java

@@ -2,7 +2,7 @@ package com.huigou.topsun.proofing.application;
 
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
-import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
 
 import java.util.List;
 import java.util.Map;
@@ -17,12 +17,12 @@ public interface ProofingApplyApplication {
 
     List<ProofingApply>  getProofingApplyList();
 
-    ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo);
+    ProofingApplyAndProductVo getProofingApplyByProofingApplyNo(String proofingApplyNo);
 
     /**
      * 根据ProofingApply获得样品和产品外观信息
      * @param id
      * @return
      */
-    ProofingApplyAndLookedVo getProofingApplyAndLookedVoByPAId(String id);
+    ProofingApplyAndProductVo getProofingApplyAndLookedVoByPAId(String id);
 }

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java

 package com.huigou.topsun.proofing.application.impl;
 
-import com.huigou.topsun.product.application.ProductApplication;
 import com.huigou.topsun.product.application.ProductCategoryApplication;
 import com.huigou.topsun.product.application.ProductLookedApplication;
 import com.huigou.topsun.product.domain.Product;
@@ -12,7 +11,7 @@ import com.huigou.topsun.product.repository.ProductRepository;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
-import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
 import com.huigou.topsun.proofing.mapper.ProofingApplyMapper;
 import com.huigou.topsun.proofing.repository.ProofingApplyRepository;
 import com.huigou.uasp.bmp.common.BizBillStatus;
@@ -125,9 +124,9 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     }
 
     @Override
-    public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
+    public ProofingApplyAndProductVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
         ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
-        ProofingApplyAndLookedVo proofingApplyAndLookedVo = this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
+        ProofingApplyAndProductVo proofingApplyAndLookedVo = this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
         ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
 
         if(productPublishedConf!=null){
@@ -138,8 +137,9 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
 
 
     @Override
-    public ProofingApplyAndLookedVo getProofingApplyAndLookedVoByPAId(String id) {
-        ProofingApplyAndLookedVo proofingApplyAndLookedVo = new ProofingApplyAndLookedVo();
+    public ProofingApplyAndProductVo getProofingApplyAndLookedVoByPAId(String id) {
+
+        ProofingApplyAndProductVo proofingApplyAndLookedVo = new ProofingApplyAndProductVo();
         ProofingApply proofingApply = this.loadProofingApplyById(id);
         ProductLooked productLooked =new ProductLooked();
         productLooked.setProductId(proofingApply.getProductId());
@@ -149,6 +149,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         BeanUtils.copyProperties(proofingApply,proofingApplyAndLookedVo);
         BeanUtils.copyProperties(newProductLooked,proofingApplyAndLookedVo);
         proofingApplyAndLookedVo.setProductCategoryName(productCategory.getProductCategoryName());
+
+
         return proofingApplyAndLookedVo;
     }
 }

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

@@ -7,16 +7,13 @@ import com.huigou.topsun.product.domain.ProductLooked;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
 
-import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
 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;
-import com.huigou.uasp.log.annotation.LogInfo;
-import com.huigou.uasp.log.domain.model.LogType;
-import com.huigou.uasp.log.domain.model.OperationType;
 import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -66,17 +63,20 @@ public class ProofingApplyController extends CommonController {
     public String forwardProofingApply(){
 
         this.putAttribute("processDefinitionKey",ProofingApplyApplication.PROCESS_DEFINITION_KEY);
-        String applicationNo= UUID.randomUUID().toString().replace("-", "");
         this.putAttribute("procUnitId", "Apply");
 
         ProofingApply proofingApply = new ProofingApply();
-        proofingApply.setProofingApplyNo(applicationNo);
         proofingApply.setStatusId(BizBillStatus.APPLYING.getId());
         Operator operator = getOperator();
         proofingApply.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+        proofingApply.setProofingApplyNo(proofingApply.getBillCode());
         return forward("proofingApply",proofingApply);
     }
 
+    /**
+     * 展示工序
+     * @return
+     */
     public String slicedTechnologyList(){
         SDO sdo = this.getSDO();
         String productId = sdo.getString("productId");
@@ -87,8 +87,6 @@ public class ProofingApplyController extends CommonController {
     }
 
 
-
-
     /**
      * 工作流审核跳转页面
      * @return
@@ -96,10 +94,14 @@ public class ProofingApplyController extends CommonController {
     public String showProofingApply() {
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
-        ProofingApplyAndLookedVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyAndLookedVoByPAId(id);
+        ProofingApplyAndProductVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyAndLookedVoByPAId(id);
         return forward("proofingApply", proofingApplyAndLookedVo);
     }
 
+    /**
+     * 根据产品编号获取外观详情
+     * @return
+     */
     public String queryProductLooked(){
         SDO sdo = this.getSDO();
         String productId = sdo.getString("productId");

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

@@ -2,11 +2,9 @@ package com.huigou.topsun.proofing.controller;
 
 
 import com.huigou.topsun.product.application.ProductLookedApplication;
-import com.huigou.topsun.product.domain.ProductLooked;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
-import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.model.ProofingMake;
-import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
 
 import com.huigou.topsun.proofing.service.ProofingMakeService;
@@ -73,11 +71,10 @@ public class ProofingMakeController extends CommonController {
      *  跳转打样制造详情页
      */
     public String forwardDetailsProofingMake(){
-
         SDO sdo = this.getSDO();
         String id = sdo.getId();
-        ProofingMakeVo proofingMakeVo =
-                (id==null||"".equals(id))?null:proofingMakeService.getProofingMakeVoById(id);
+        this.putAttribute("isDetailPage","true");
+        ProofingMakeVo proofingMakeVo =(id==null||"".equals(id))?null:proofingMakeService.getProofingMakeVoById(id);
         return forward("proofingMake",proofingMakeVo);
     }
 
@@ -107,7 +104,7 @@ public class ProofingMakeController extends CommonController {
     public String queryProofingApply(){
         SDO sdo = this.getSDO();
         String proofingApplyNo = sdo.getString("proofingApplyNo");
-        ProofingApplyAndLookedVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyByProofingApplyNo(proofingApplyNo);
+        ProofingApplyAndProductVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyByProofingApplyNo(proofingApplyNo);
         return toResult(proofingApplyAndLookedVo);
     }
 

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

@@ -34,8 +34,11 @@ public class WorkInstrcutionApplyController extends CommonController {
 
 
     public String forwardWorkInstrcutionApply(){
-        String proofingMakeNo = UUID.randomUUID().toString().replace("-", "");
-        this.putAttribute("proofingMakeNo", proofingMakeNo);
+        String workInstrcutionApplyId = UUID.randomUUID().toString().replace("-", "");
+        this.putAttribute("workInstrcutionApplyId", workInstrcutionApplyId);
+        SDO sdo = this.getSDO();
+        String productId = sdo.getString("productId");
+        if(productId!=null&&!"".equals(productId))this.putAttribute("productId", productId);
         return forward("workInstrcutionApply");
     }
 

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingApplyAndLookedVo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingApplyAndProductVo.java

 package com.huigou.topsun.proofing.domain.vo;
 
-import com.huigou.data.domain.model.FlowBillAbstractEntity;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
 import java.util.Date;
 
 /**
  * 样品申请与外观
  */
 @Data
-public class ProofingApplyAndLookedVo extends FlowBillAbstractEntity{
+public class ProofingApplyAndProductVo {
     /**
      * 申请单id
      */
@@ -243,8 +240,4 @@ public class ProofingApplyAndLookedVo extends FlowBillAbstractEntity{
     private String productSheetConf;
 
 
-    @Override
-    protected String getCodeRuleId() {
-        return null;
-    }
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/mapper/ProofingApplyMapper.java

 package com.huigou.topsun.proofing.mapper;
 
 import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
 import com.topsunit.query.annotations.Mapper;
 
 import java.util.Map;
@@ -13,4 +14,6 @@ public interface ProofingApplyMapper {
 
     Map<String, Object> slicedQuery(ProofingApplyQuery query);
 
+
+//    ProofingApplyAndProductVo queryProofingApplyAndProduct();
 }

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

@@ -8,9 +8,36 @@
     </easy-search>
 
     <easy-search name="proofingMakeCode" desc="订单">
-        <sql>select pa.product_id,pm.proofing_make_no,pa.id from proofing_make pm inner join proofing_apply pa on(pm.proofing_apply_id=pa.id)</sql>
+        <sql>
+            SELECT
+            pm.proofing_make_no,
+            pa.proofing_apply_no,
+            p.product_id,
+            p.product_name,
+            p.product_type,
+            p.brand_name,
+            pd.product_english_name,
+            pl.store_name
+            FROM
+            proofing_make pm
+            INNER JOIN
+            proofing_apply pa ON pm.proofing_apply_id = pa.proofing_apply_id
+            INNER JOIN
+            product p ON pa.product_id = p.product_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
+        </sql>
         <field name="产品编号" title="产品编号" code="productId" width="200" />
         <field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" />
-        <field name="申请单号" title="申请单号" code="id" width="200" />
+        <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
+
+
+        <field name="类型" title="类型" code="productType" width="200" type="hidden"/>
+        <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>
+        <field name="名称" title="名称" code="productName" width="200" type="hidden"/>
+        <field name="英文名称" title="英文名称" code="productEnglishName" width="200" type="hidden"/>
+        <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>
     </easy-search>
 </easy-search-mappings>
\ No newline at end of file