申请和制造展示页

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

 $(document).ready(function () {
     bindQueryEvent();
-    echo("productId");
+    console.log("@"+$("#productId").val())
+    showTechnologyTable($("#productId").val());
+    echo("productId")
 });
 function echo(node){
 	$("#"+node+"_text").val($("#"+node).val())
@@ -16,6 +18,7 @@ function bindQueryEvent() {
             $('#productId').val(data.productId);
             $('#productCategoryName').val(data.productCategoryName);
             $('#customerId').val(data.productCategoryName);
+            renderDataGoForm(data.productId);
             showTechnologyTable(data.productId);
         }
     });
@@ -38,3 +41,32 @@ function getId() {
     return $("#proofingApplyId").val() || "";
 }
 
+
+/**
+ * 根据申请单号发送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

@@ -49,7 +49,7 @@
                 <x:inputC name="proofingType" label="打样形式" labelCol="1" fieldCol="2"/>
 
 <%--                <x:selectC name="page" label="版面" dictionary="prodcutLayout" labelCol="1" fieldCol="2"/>--%>
-                <x:inputC name="page" label="版面" required="true" labelCol="1" fieldCol="2"/>
+                <x:inputC name="page" label="版面"  labelCol="1" fieldCol="2"/>
 
 
                 <x:inputC name="proofingApplyAllocationType" label="分配方式" maxLength="32" labelCol="1" fieldCol="2"/>
@@ -76,17 +76,17 @@
                            fieldCol="2"/>
                 <x:inputC name="plasticBagType" required="false" label="塑料袋结构类型" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productLength" required="true" label="长度（cm）" maxLength="32" labelCol="1"
+                <x:inputC name="productLength" label="长度（cm）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productWidth" required="true" label="宽度（cm）" maxLength="32" labelCol="1"
+                <x:inputC name="productWidth" label="宽度（cm）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productHeight" required="true" label="高度（cm）" maxLength="32" labelCol="1"
+                <x:inputC name="productHeight" label="高度（cm）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productThick" required="true" label="厚度（mm）" maxLength="32" labelCol="1"
+                <x:inputC name="productThick" label="厚度（mm）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productSingleLayer" required="true" label="单层厚（丝）" maxLength="32" labelCol="1"
+                <x:inputC name="productSingleLayer" label="单层厚（丝）" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productLayerNum" required="true" label="层数" maxLength="32" labelCol="1"
+                <x:inputC name="productLayerNum" label="层数" maxLength="32" labelCol="1"
                           fieldCol="2"/>
             </div>
         </div>

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

@@ -147,7 +147,7 @@ function loadProofingApplyListGrid() {
         fixedCellHeight: true,
         selectRowButtonOnly: true,
         onDblClickRow: function (data, rowindex, rowobj) {
-            doView(data.id);
+            // doView(data.id);
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);

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

@@ -64,3 +64,22 @@ function renderDataGoForm(proofingApplyNo) {
 }
 
 
+function saveForm(){
+    var _self=this;
+    $('#submitForm').ajaxSubmit({
+        url : web_app.name + '/proofingMake/saveProofingMake.ajax',
+        param:{},
+        success : function(data) {
+            if (data == "1"){
+                Public.successTip("保存成功！");
+            }
+            _self.close();
+        }
+    });
+
+    // UICtrl.addTabItem({
+    //     tabid: 'workInstrcutionApply',
+    //     text: "详情",
+    //     url: web_app.name + '/proofingMake/forwardDetailsProofingMake.do?id='+proofingMakeId
+    // });
+}
\ No newline at end of file

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

@@ -57,7 +57,7 @@
                 <x:inputC name="proofingApplyNgReReason" readonly="true" label="NG重新打样原因" maxLength="32"
                           labelCol="1" fieldCol="2"/>
                 <x:inputC name="a" readonly="true" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
-                <x:selectC name="proofingApplyTestStandard"  required="true" dictionary="handleResult" label="申请单状态"
+                <x:selectC name="proofingApplyTestStandard"  dictionary="handleResult" label="申请单状态"
                           labelCol="1" fieldCol="2"/>
 
 
@@ -152,7 +152,7 @@
         <%@ include file="technologyAndBom/technologyAndBom.jsp" %>
         <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="saveForm()" icon="fa-save"/>
             <x:button value="重置" onclick="" icon="fa-history"/>
         </div>
     </form>

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

@@ -56,7 +56,7 @@ function loadProofingApplyGrid(obj) {
 		parms:obj.parms,
 		pageSize: 10,
 		usePager: true,
-		width: "50%",
+		width: "100%",
 		height: 400,
 		heightDiff: -8,
 		fixedCellHeight: true,

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

@@ -10,7 +10,7 @@
         <div><h3>基本信息</h3></div>
         <div style="margin: 10px;">
             <div class="hg-form-cols">
-                <x:inputC name="proofingMakeNo"  label="指导书编号" labelCol="2" fieldCol="2"/>
+                <x:inputC name="workInstrcutionApplyId"  label="指导书编号" labelCol="2" fieldCol="2"/>
 
                 <x:inputC name="productId"  label="产品编号" labelCol="2" fieldCol="2"/>
 
@@ -47,5 +47,9 @@
         </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/product/repository/ProductLookedRepository.java

@@ -13,6 +13,5 @@ public interface ProductLookedRepository extends JpaRepository<ProductLooked,Str
     ProductLooked findByProductId(String productId);
     ProductLooked findByProductIdEquals(String productId);
 
-    ProductLooked getProductLookedByProductId(String productId);
 
 }

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

@@ -6,6 +6,8 @@ import com.huigou.topsun.product.application.ProductLookedApplication;
 import com.huigou.topsun.product.domain.Product;
 import com.huigou.topsun.product.domain.ProductCategory;
 import com.huigou.topsun.product.domain.ProductLooked;
+import com.huigou.topsun.product.domain.ProductPublishedConf;
+import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
 import com.huigou.topsun.product.repository.ProductRepository;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
@@ -44,6 +46,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     private ProductCategoryApplication productCategoryApplication;
     @Autowired
     private ProductRepository productRepository;
+    @Autowired
+    private ProductPublishedConfRepository productPublishedConfRepository;
 
 
     @Override
@@ -123,7 +127,10 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     @Override
     public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
         ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
-        return this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
+        ProofingApplyAndLookedVo proofingApplyAndLookedVo = this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
+        ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
+        BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo);
+        return proofingApplyAndLookedVo;
     }
 
 

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

@@ -2,6 +2,8 @@ package com.huigou.topsun.proofing.controller;
 
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+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;
 
@@ -29,12 +31,12 @@ public class ProofingApplyController extends CommonController {
         return "/biz/topsun/proofing/";
     }
 
-
-
     @Autowired
     ProofingApplyApplication proofingApplyApplication;
     @Autowired
     TechnologyApplication technologyApplication;
+    @Autowired
+    ProductLookedApplication productLookedApplication;
 
     @Resource
     private TechnologyProcessApplication technologyProcessApplication;
@@ -98,13 +100,12 @@ public class ProofingApplyController extends CommonController {
         return forward("proofingApply", proofingApplyAndLookedVo);
     }
 
-//    /**
-//     * 跳转到打样申请详情页面
-//     */
-//    public String skipProofingApply() {
-//        SDO sdo = this.getSDO();
-//        String id = sdo.getId();
-//        ProofingApplyAndLookedVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyAndLookedVoByPAId(id);
-//        return forward("proofingApply", proofingApplyAndLookedVo);
-//    }
+    public String queryProductLooked(){
+        SDO sdo = this.getSDO();
+        String productId = sdo.getString("productId");
+        ProductLooked productLooked = new ProductLooked();
+        productLooked.setProductId(productId);
+        ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
+        return toResult(newProductLooked);
+    }
 }

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

 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.ProofingMakeVo;
 
@@ -34,6 +37,8 @@ public class ProofingMakeController extends CommonController {
     ProofingMakeService proofingMakeService;
     @Autowired
     ProofingApplyApplication proofingApplyApplication;
+    @Autowired
+    ProductLookedApplication productLookedApplication;
 
 
     /**
@@ -82,9 +87,9 @@ public class ProofingMakeController extends CommonController {
      */
     public String saveProofingMake(){
         SDO sdo = this.getSDO();
-        ProofingMakeVo proofingMakeVo = sdo.toObject(ProofingMakeVo.class);
-        proofingMakeService.saveProofingMakeVo(proofingMakeVo);
-       return success(proofingMakeVo);
+        ProofingMake proofingMake = sdo.toObject(ProofingMake.class);
+        proofingMakeService.saveProofingMakeVo(proofingMake);
+       return success(proofingMake);
     }
 
 
@@ -105,4 +110,6 @@ public class ProofingMakeController extends CommonController {
         ProofingApplyAndLookedVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyByProofingApplyNo(proofingApplyNo);
         return toResult(proofingApplyAndLookedVo);
     }
+
+
 }

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

@@ -34,8 +34,8 @@ public class WorkInstrcutionApplyController extends CommonController {
 
 
     public String forwardWorkInstrcutionApply(){
-      //  String proofingMakeNo = UUID.randomUUID().toString().replace("-", "");
-//        this.putAttribute("proofingMakeNo", proofingMakeNo);
+        String proofingMakeNo = UUID.randomUUID().toString().replace("-", "");
+        this.putAttribute("proofingMakeNo", proofingMakeNo);
         return forward("workInstrcutionApply");
     }
 

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

@@ -3,6 +3,8 @@ 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;
 
 /**
@@ -184,6 +186,63 @@ public class ProofingApplyAndLookedVo extends FlowBillAbstractEntity{
      */
     private Integer productLayerNum;
 
+    /**
+     * 排版参数配置ID
+     */
+    private String productPublishedConfId;
+
+
+    /**
+     * 模数
+     */
+    private Integer modulus;
+
+    /**
+     * 行数
+     */
+    private Integer rowNum;
+
+    /**
+     * 列数
+     */
+    private Integer columnNum;
+
+    /**
+     * 搭版数
+     */
+    private Integer contactNum;
+
+    /**
+     * 行双刀位(单位mm)
+     */
+    private Double rowDoubleBlade;
+
+    /**
+     * 列双刀位(单位mm)
+     */
+    private Double columnDoubleBlade;
+
+    /**
+     * 派工倍数
+     */
+    private Integer dispatchMultiple;
+
+    /**
+     * 印张长度(单位cm)
+     */
+    private Double sheetLength;
+
+    /**
+     * 印张宽度(单位cm)
+     */
+    private Double sheetWidth;
+
+    /**
+     * 产品印张设置(product_sheet_conf)
+     */
+    private String productSheetConf;
+
+
     @Override
     protected String getCodeRuleId() {
         return null;

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

@@ -8,7 +8,7 @@ import java.util.Map;
 /**
  * @author yonghuan
  */
-@Mapper(xml = "config/demo/proofingApply.xml")
+@Mapper(xml = "config/topsun/proofing/proofingApply.xml")
 public interface ProofingApplyMapper {
 
     Map<String, Object> slicedQuery(ProofingApplyQuery query);

topsun/src/main/java/com/huigou/topsun/proofing/service/ProofingMakeService.java

 package com.huigou.topsun.proofing.service;
 
+import com.huigou.topsun.proofing.domain.model.ProofingMake;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
 
 import java.util.List;
@@ -18,9 +19,9 @@ public interface ProofingMakeService {
 
     /**
      *编辑打样制造信息（或添加或修改打样制造与之相关的表）
-     * @param proofingMakeVo
+     * @param proofingMake
      */
-     void saveProofingMakeVo(ProofingMakeVo proofingMakeVo);
+     void saveProofingMakeVo(ProofingMake proofingMake);
 
     void deleteProofingMakeVo(String proofingMakeId);
 

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

@@ -36,34 +36,32 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
 
     public List<ProofingMakeVo> getProofingMakeVoList(){
         List<ProofingMake> makeAll = proofingMakeRepository.findAll();
-        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);
-                })
-                .collect(Collectors.toList());
+        List<ProofingMakeVo> makeVoList = new ArrayList<>();
+
+        for (ProofingMake proofingMake : makeAll) {
+            ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
+            ProofingMakeVo proofingMakeVo = getProofingMakeVo(proofingMake, proofingApply);
+            makeVoList.add(proofingMakeVo);
+        }
+
+        return makeVoList;
     }
 
     @Override
     public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
         ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
-        ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
-        ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
+        ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
+        ProductLooked productLooked = productLookedRepository.findByProductId(proofingApply.getProductId());
         ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
         return this.getProofingMakeVo(proofingApply,proofingMake,productLooked,productPublishedConf);
     }
 
     /**
-     * 分解ProofingMakeVo
-     * @param proofingMakeVo
+     * 分解ProofingMake
+     * @param proofingMake
      */
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
-    public void saveProofingMakeVo(ProofingMakeVo proofingMakeVo) {
-        ProofingMake proofingMake = new ProofingMake();
-        BeanUtils.copyProperties(proofingMakeVo, proofingMake);
-        proofingMake.setProofingApplyId(proofingMakeVo.getId());
+    public void saveProofingMakeVo(ProofingMake proofingMake) {
         proofingMakeRepository.save(proofingMake);
     }
 
@@ -79,7 +77,9 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
     public ProofingMakeVo getProofingMakeVo(Object... objs){
         ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
         for (Object obj : objs) {
-            BeanUtils.copyProperties(obj, proofingMakeVo);
+            if(obj!=null){
+                BeanUtils.copyProperties(obj, proofingMakeVo);
+            }
         }
         return proofingMakeVo;
     }

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

@@ -14,6 +14,16 @@
 <!--        <field name="版面" title="版面" code="productCategoryName" width="200" />-->
     </easy-search>
 
+
+    <easy-search name="productS" desc="产品">
+        <sql>
+            select pa.product_id,pm.proofing_make_no
+            from proofing_make pm inner join proofing_apply pa on(pm.proofing_apply_id=pa.id)
+        </sql>
+        <field name="制造单号" title="制造单号" code="proofingMakeNo" width="200" />
+        <field name="产品id" title="产品id" code="productId" width="200" />
+    </easy-search>
+
 <!--    <easy-search name="productType" desc="产品状态" >-->
 <!--        <sql>select pc.* from-->
 <!--            product_category pc</sql>-->