修复已知问题

huigou-xt/src/main/webapp/system/bpm/job.js

@@ -294,7 +294,7 @@ function startup(operate, fn, showTips) {
 
 // 保存
 function save(fn, showTips) {
-
+    debugger
     var extendedData = getExtendedData(ProcessAction.SAVE);
     if (extendedData === false) {
         return false;
@@ -361,7 +361,7 @@ function doQueryAdvance() {
     });
 }
 
-function doQueryHandlers() {
+function doQueryHandlers() {debugger
     var extendedData = getExtendedData(ProcessAction.QUERY_HANDLERS);
     if (extendedData === false) {
         return;

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

@@ -43,12 +43,14 @@ function getId() {
     return $("#proofingApplyId").val() || "";
 }
 
+//获取数据并填充
 function ajaxRenderDataGoForm(params){
     Public.ajax(web_app.name + '/proofingApply/queryProductLooked.ajax',params,function (data){
         $('#submitForm').formSet(data);
     })
 }
 
+
 function getExtendedData(processAction) {
     debugger
 //回退、打回、转交时，不需要验证必填项是否已经填写；
@@ -76,39 +78,3 @@ function getExtendedData(processAction) {
 
     return extendedData;
 }
\ No newline at end of file
-function getExtendedData111(processAction) {
-//回退、打回、转交时，不需要验证必填项是否已经填写；
-    if (processAction == ProcessAction.BACK
-        || processAction == ProcessAction.REPLENISH
-        || processAction == ProcessAction.TRANSMIT) {
-//不验证
-        $('#submitForm').attr('check', false);
-    }
-    const isAllData = $('#oldId') || !getId();
-    var extendedData = {};
-    var _grid = UICtrl.getGridManager('#purchaseBudgetGrid');
-    if (_grid) {
-        var datas = DataUtil.getGridData({
-            gridManager: _grid,
-            isAllData: isAllData
-        });
-        if (!datas) {
-            return false;
-        }
-        extendedData.datas = Public.encodeJSONURI(datas);
-    }
-
-    var _developMembersGrid = UICtrl.getGridManager('#developMembersGrid');
-    if (_developMembersGrid) {
-        var developMembers = DataUtil.getGridData({
-            gridManager: _developMembersGrid,
-            isAllData: isAllData
-        });
-        if (!developMembers) {
-            return false;
-        }
-        extendedData.developMembers = Public.encodeJSONURI(developMembers);
-    }
-
-    return extendedData;
-}
\ No newline at end of file

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

@@ -20,6 +20,7 @@ function initialize() {
         }
         if (productId != null && productId !== '') {
             showTechnologyTable(productId);
+            // showTable();
         }
         $("#formButton").hide();
     }
@@ -37,7 +38,10 @@ function bindQueryEvent() {
     });
 }
 
-
+/**
+ * 表单提交
+ * @returns {boolean}
+ */
 function saveForm() {
     let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
     if (!technologyResult) {
@@ -63,7 +67,7 @@ function saveForm() {
             _self.close();
         }
     });
-
+    //新开作业指导申请书页
     let productId = $("#productId").val();
     let proofingMakeNo = $("#proofingMakeNo").val();
     UICtrl.addTabItem({
@@ -78,6 +82,10 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
+/**
+ * 根据请求获取的数据填充到页面
+ * @param proofingApplyNo
+ */
 function ajaxRenderDataGoForm(proofingApplyNo) {
     Public.ajax(web_app.name + '/proofingMake/queryProofingApply.ajax', {proofingApplyNo: proofingApplyNo}, function (data) {
         //替换前缀为proofingApply的字段为proofingMake
@@ -92,6 +100,7 @@ function ajaxRenderDataGoForm(proofingApplyNo) {
             return acc;
         }, {});
         $('#submitForm').formSet(updatedData);
+        //填充select框
         renderingDictionaries(updatedData);
     })
 }
@@ -104,12 +113,11 @@ function ajaxRenderDataGoForm(proofingApplyNo) {
 function renderingDictionaries(obj) {
 
     console.log(obj)
+    //获取所有select的id名与对象匹配
     $("select").each(function () {
         var id = $(this).attr("id");
         if (obj.hasOwnProperty(id)) {
 
-
-
             var keyValuePairs = new Map();
 
             $('#' + id + ' option').each(function () {
@@ -129,5 +137,4 @@ function renderingDictionaries(obj) {
             console.log("select:" + id+"("+selectedText+":"+selectedValue+")")
         }
     });
-
 }

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

-//因为页面表格较多，每次操作一张表格时需要切换gridManager
+//是否开启联动事件
 var isDetail=false;
 //定义生成表格的参数对象
 var bomObj={
@@ -153,6 +153,11 @@ function loadProofingApplyGrid(obj) {
 // 		this.gridManager=processObj.gridManager;
 // 	})
 // }
+/**
+ * 详情页初始化调用
+ * 获取工艺工序等数据生成表格
+ * @param proofingApplyId
+ */
 function showTable(proofingApplyId) {
 	 isDetail=true;
 	technologyObj.parms = {proofingApplyId: proofingApplyId}

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

@@ -14,7 +14,6 @@ function bindQueryEvent() {
 
 
 function saveForm(){
-    debugger
     var _self=this;
     $('#submitForm').ajaxSubmit({
         url : web_app.name + '/workInstruction/saveWorkInstruction.ajax',

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

 package com.huigou.topsun.proofing.application;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeBaseInfo;
 import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
@@ -20,7 +21,7 @@ public interface ProofingMakeApplication {
     /**
      *编辑打样制造信息
      */
-    void saveProofingMake(SDO sdo);
+    void saveProofingMake(SDO sdo) throws JsonProcessingException;
 
 
     ProofingMakeVo getProofingMakeVoById(String proofingMakeId);

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

+package com.huigou.topsun.proofing.application;
+
+import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
+
+import java.util.Map;
+
+public interface ProofingMakeProcessApplication {
+    String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingMake.xml";
+
+
+    Map<String, Object> slicedProofingMakeProcess(ProofingApplyProcessQueryRequest query);
+}

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

+package com.huigou.topsun.proofing.application;
+
+import com.huigou.topsun.proofing.domain.query.ProofingMakeTechnologyQueryRequest;
+import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
+
+import java.util.Map;
+
+public interface ProofingMakeTechnologyApplication {
+
+    String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingMake.xml";
+
+
+    Map<String, Object> slicedProofingMakeTechnology(ProofingMakeTechnologyQueryRequest query);
+
+}

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

@@ -86,7 +86,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         } else {
             proofingApply = (ProofingApplyBaseInfo) commonDomainService.loadAndFillinProperties(proofingApply);
         }
-
+        //二次保存不添加id
         String id = UUID.randomUUID().toString().replace("-", "");
         if (proofingApply.getProofingApplyId() == null || proofingApply.getProofingApplyId().isEmpty()) {
             proofingApply.setProofingApplyId(id);
@@ -100,11 +100,12 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
 
 
         ProofingApplyLooked looked = proofingApplyLookedRepository.findByProofingApplyId(proofingApply.getProofingApplyId());
+        //录入ProofingApplyLooked是先判断是需要新增还是修改
         proofingApplyLooked.setProofingApplyLookedId(looked != null ? looked.getProofingApplyLookedId() : null);
         proofingApplyLooked.setProofingApplyId(proofingApply.getProofingApplyId());
         proofingApplyLookedRepository.save(proofingApplyLooked);
 
-        /**
+        /*
          * 将样品的相关工艺工序等删除
          */
         List<ProofingApplyTechnology> technologiesToDelete = proofingTechnologyRepository.findAllByProofingApplyId(proofingApply.getProofingApplyId());

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

 package com.huigou.topsun.proofing.application.impl;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huigou.data.query.model.QueryDescriptor;
+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.product.repository.ProductRepository;
 import com.huigou.topsun.proofing.application.ProofingMakeApplication;
 
 import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
@@ -31,6 +37,12 @@ import java.util.Map;
 @Service
 public class ProofingMakeApplicationImpl extends BaseApplication implements ProofingMakeApplication {
 
+    @Autowired
+    ProductLookedRepository productLookedRepository;
+//    @Autowired
+//    ProductRepository productRepository;
+    @Autowired
+    ProductPublishedConfRepository productPublishedConfRepository;
     @Autowired
     ProofingMakeRepository proofingMakeRepository;
     @Autowired
@@ -57,10 +69,9 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
      * 编辑打样制造及相关信息
      * @param sdo 打样制造及相关信息
      */
-    @SneakyThrows
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
-    public void saveProofingMake(SDO sdo) {
+    public void saveProofingMake(SDO sdo) throws JsonProcessingException {
         ProofingMakeBaseInfo proofingMakeBaseInfo = sdo.toObject(ProofingMakeBaseInfo.class);
         ProofingMakeLooked proofingMakeLooked = sdo.toObject(ProofingMakeLooked.class);
         ProofingMakePdPublishedConf proofingMakePdPublishedConf = sdo.toObject(ProofingMakePdPublishedConf.class);
@@ -87,6 +98,16 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
             proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingTechnologyId());
             proofingMakeProcessRepository.save(proofingMakeProcess);
         }
+
+        //编辑产品信息
+        ProductLooked productLooked = sdo.toObject(ProductLooked.class);
+        ProductPublishedConf productPublishedConf = sdo.toObject(ProductPublishedConf.class);
+        ProductLooked looked = productLookedRepository.findByProductId(productLooked.getProductId());
+        productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId());
+        productLookedRepository.save(productLooked);
+        ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId());
+        productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId());
+        productPublishedConfRepository.save(productPublishedConf);
     }
 
     @Override

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

@@ -25,6 +25,11 @@ public class WorkInstructionApplicationImpl implements WorkInstructionApplicatio
     @Autowired
     WorkInstructionProductLossRepository workInstructionProductLossRepository;
 
+    /**
+     * 添加作业指导书及相关信息
+     * @param sdo
+     * @return
+     */
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String saveWorkInstruction(SDO sdo) {

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

@@ -104,20 +104,7 @@ public class ProofingApplyController extends CommonController {
      */
     public String queryProductLooked(){
         SDO sdo = this.getSDO();
-        String proofingApplyNo = sdo.getString("proofingApplyNo");
         String productId = sdo.getString("productId");
-//        if(proofingApplyNo!=null&&!"".equals(proofingApplyNo)){
-//            ProofingApplyBaseInfo proofingApplyBaseInfo = proofingApplyApplication.selectProofingApplyByProofingApplyNo(proofingApplyNo);
-//            ProofingApplyLooked proofingApplyLooked = proofingApplyLookedApplication.findByProofingApplyId(proofingApplyBaseInfo.getProofingApplyId());
-//            return toResult(proofingApplyLooked);
-//        }else if(productId!=null&&!"".equals(productId)){
-//            ProductLooked productLooked = new ProductLooked();
-//            productLooked.setProductId(productId);
-//            ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
-//            return toResult(newProductLooked);
-//        }
-//        return toResult(null);
-
         ProductLooked productLooked = new ProductLooked();
         productLooked.setProductId(Long.valueOf(productId));
         ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
@@ -135,6 +122,7 @@ public class ProofingApplyController extends CommonController {
         TechnologyQueryRequest queryRequest = sdo.toQueryRequest(TechnologyQueryRequest.class);
         proofingApplyTechnologyQueryRequest proofingApplyTechnologyQueryRequest = sdo.toQueryRequest(proofingApplyTechnologyQueryRequest.class);
         Map<String, Object> map = new HashMap<>();
+        //判断需要展示产品工艺还是打样表中工艺
         if(proofingApplyTechnologyQueryRequest.getProofingApplyId()!=null&&!proofingApplyTechnologyQueryRequest.getProofingApplyId().equals("")){
             map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
         }else if(queryRequest.getProductId()!=null&&!queryRequest.getProductId().equals("")){
@@ -152,6 +140,7 @@ public class ProofingApplyController extends CommonController {
         SDO sdo = this.getSDO();
         String technologyId = sdo.getString("technologyId");
         ProofingApplyProcessQueryRequest proofingApplyProcessQueryRequest = sdo.toQueryRequest(ProofingApplyProcessQueryRequest.class);
+        //判断需要展示产品工序还是打样表中工序
         if(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId()!=null&&!proofingApplyProcessQueryRequest.getProofingApplyTechnologyId().equals("")){
            return toResult(proofingApplyProcessApplication.slicedProofingApplyProcess(proofingApplyProcessQueryRequest));
         }else if(technologyId!=null&&!technologyId.equals("")){

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

 package com.huigou.topsun.proofing.controller;
 
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.huigou.topsun.product.application.ProductLookedApplication;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
@@ -89,7 +90,11 @@ public class ProofingMakeController extends CommonController {
      */
     public String saveProofingMake(){
         SDO sdo = this.getSDO();
+        try {
             proofingMakeApplication.saveProofingMake(sdo);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
         return success();
     }
 

topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeProcessQueryRequest.java

+package com.huigou.topsun.proofing.domain.query;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.huigou.data.domain.query.QueryAbstractRequest;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 打样制作单工序
+ */
+@Data
+public class ProofingMakeProcessQueryRequest  extends QueryAbstractRequest {
+    /**
+     * 工序ID
+     */
+
+    private String proofingMakeProcessId;
+
+    /**
+     * 打样制作单工艺id
+     */
+
+    private String proofingMakeTechnologyId;
+
+    /**
+     * 工序名称
+     */
+
+    private String processName;
+
+    /**
+     * 工序说明
+     */
+
+    private String processRemark;
+
+    /**
+     * 工时
+     */
+
+    private Double workHours;
+
+    /**
+     * 工序类别(process_type)
+     */
+
+    private String processType;
+
+    /**
+     * 工序内容
+     */
+
+    private String processContent;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeTechnologyQueryRequest.java

+package com.huigou.topsun.proofing.domain.query;
+
+import com.huigou.data.domain.query.QueryAbstractRequest;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 打样工艺
+ */
+@Data
+public class ProofingMakeTechnologyQueryRequest  extends QueryAbstractRequest {
+    /**
+     * 打样工艺id
+     */
+
+    private String proofingTechnologyId;
+
+    /**
+     * 工艺id
+     */
+    private String technologyId;
+
+    /**
+     * 工艺名称
+     */
+    private String technologyName;
+
+    /**
+     * 打样制作单id
+     */
+    private String proofingMakeId;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeProcessRepository.java

 package com.huigou.topsun.proofing.repository;
 
 import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeProcess;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface ProofingMakeProcessRepository extends JpaRepository<ProofingMakeProcess, String> {
+    List<ProofingMakeProcess> findAllByProofingMakeTechnologyId(String proofingMakeTechnologyId);
 }

topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeTechnologyRepository.java

 package com.huigou.topsun.proofing.repository;
 
+import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyTechnology;
 import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeTechnology;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface ProofingMakeTechnologyRepository extends JpaRepository<ProofingMakeTechnology,String> {
+
+    List<ProofingMakeTechnology> findAllByProofingMakeId(String proofingMakeId);
 }

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

@@ -40,7 +40,7 @@
             LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id
         </sql>
         <field name="产品id" title="产品id" code="productId" width="200" />
-        <field name="产品name" title="产品name" code="productName" width="200" type='hidden'/>
+        <field name="产品name" title="产品name" code="productName" width="200"/>
         <field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
         <field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
         <field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>

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

@@ -9,5 +9,18 @@
             proofing_make_base_info pm
         </sql-query>
     </query>
+    <query name="slicedProofingMakeTechnology" table="proofing_Make_technology">
+        <sql-query>
+            select t.* from proofing_make_technology t
+        </sql-query>
+        <condition column="proofing_make_id" name="proofingMakeId" type="java.lang.String" symbol="=" alias="t"/>
+    </query>
+
+    <query name="slicedProofingMakeProcess" table="proofing_make_process">
+        <sql-query>
+            select t.* from proofing_make_process t
+        </sql-query>
+        <condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
+    </query>
 
 </query-mappings>
\ No newline at end of file