二次保存

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

@@ -33,7 +33,7 @@
                 <x:hidden name="productId"/>
                 <x:inputC name="productCode" wrapper="select" label="产品编号" labelCol="1" fieldCol="2"/>
 
-                <x:inputC name="customerId" label="品牌客户编号"   labelCol="1" fieldCol="2"/>
+                <x:inputC name="customerCode" label="品牌客户编号"   labelCol="1" fieldCol="2"/>
 
                 <x:inputC name="proofingApplyPageNeedTime" label="版面需求时间" wrapper="date" labelCol="1"
                           fieldCol="2"/>
@@ -76,7 +76,7 @@
                            fieldCol="2"/>
                 <x:selectC name="isChange"  label="是否改变" dictionary="yesorno" labelCol="1"
                            fieldCol="2"/>
-                <x:inputC name="plasticBagType"  label="塑料袋结构类型" maxLength="32" labelCol="1"
+                <x:inputC name="plasticBagStructure"  label="塑料袋结构类型" maxLength="32" labelCol="1"
                           fieldCol="2"/>
                 <x:inputC name="productLength" label="长度（cm）"   maxLength="32" labelCol="1"
                           fieldCol="2"/>

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

@@ -41,27 +41,20 @@ function saveForm() {
    let extendedData= getTableResult();
 
    if(!extendedData) return false;
-
+    debugger
     var _self = this;
     $('#submitForm').ajaxSubmit({
         url: web_app.name + '/proofingMake/saveProofingMake.ajax',
         param: extendedData,
         success: function (data) {
-            if (data == "1") {
-                Public.successTip("保存成功！");
-            }
+            debugger
+            $("#proofingMakeId").val(data.proofingMakeId)
+            $("#proofingMakeLookedId").val(data.proofingMakeLookedId)
+            $("#proofingMakePdPublishedConfId").val(data.proofingMakePdPublishedConfId)
+            Public.successTip("保存成功！");
             _self.close();
         }
     });
-    // //新开作业指导申请书页
-    // let productId = $("#productId").val();
-    // let proofingMakeNo = $("#proofingMakeNo").val();
-    // UICtrl.addTabItem({
-    //     tabid: 'workInstructionApply' + proofingMakeNo,
-    //     text: "作业指导申请书",
-    //     url: web_app.name + '/workInstructionApply/forwardWorkInstructionApply.do?productId=' + productId
-    // });
-
 }
 
 

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

@@ -60,7 +60,7 @@
 
                 <x:inputC name="proofingMakeAllocationType" label="分配方式" maxLength="32" labelCol="1" fieldCol="2"/>
 
-                <x:inputC name="productType" label="产品类别" labelCol="1" fieldCol="2"/>
+                <x:inputC name="productCategoryName" label="产品类别" labelCol="1" fieldCol="2"/>
 
                 <x:inputC name="proofingMakeSurfaceTreatment"  label="表面处理" maxLength="32"
                           labelCol="1" fieldCol="2"/>

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

@@ -109,7 +109,7 @@ var processBomObj={
 				},
 			}
 		},
-		{ display: "SAP物料详细信息", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
+		{ display: "SAP物料详细信息", name: "materialJson", width: 140, minWidth: 60, type: "string", align: "left" },
 		{ display: "使用的物料数量", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" ,
 			editor: {
                 required: true,

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

@@ -40,9 +40,14 @@ function saveForm(){
         url : web_app.name + '/workInstruction/saveWorkInstruction.ajax',
         param:{},
         success : function(data) {
-            if (data == "1"){
-                Public.successTip("保存成功！");
-            }
+            debugger
+            $("#workInstructionBaseInfoId").val(data.workInstructionBaseInfoId);
+            $("#workInstructionMaterialInfoId").val(data.workInstructionMaterialInfoId);
+            $("#workInstructionOptionalAttributeId").val(data.workInstructionOptionalAttributeId);
+            $("#workInstructionPdPublishedConfId").val(data.workInstructionPdPublishedConfId);
+            $("#workInstructionPrdLookedId").val(data.workInstructionPrdLookedId);
+            $("#productLossId").val(data.productLossId);
+            Public.successTip("保存成功！");
             _self.close();
         }
     });

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.proofingMake.model.ProofingMakeBaseInfo;
 import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeQueryRequest;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
 import com.huigou.util.SDO;
@@ -21,7 +22,7 @@ public interface ProofingMakeApplication {
     /**
      *编辑打样制造信息
      */
-    void saveProofingMake(SDO sdo) throws JsonProcessingException;
+    Map<String,Object> saveProofingMake(SDO sdo);
 
 
     ProofingMakeVo getProofingMakeVoById(String proofingMakeId);

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

 package com.huigou.topsun.proofing.application;
 
 import com.huigou.topsun.proofing.domain.vo.WorkInstructionVo;
+import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionBaseInfo;
 import com.huigou.topsun.proofing.domain.workInstruction.query.WorkInstructionBaseInfoQueryRequest;
 import com.huigou.util.SDO;
 
@@ -15,7 +16,7 @@ public interface WorkInstructionApplication {
      * @param sdo
      * @return
      */
-    String saveWorkInstruction(SDO sdo);
+    Map<String,Object> saveWorkInstruction(SDO sdo);
 
     Map<String,Object> slicedWorkInstructionBaseInfoList(WorkInstructionBaseInfoQueryRequest queryRequest);
 

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

@@ -64,8 +64,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     }
 
     @SneakyThrows
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-//    @Transactional(propagation = Propagation.NEVER)
+//    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.NEVER)
     @Override
     protected String saveBizAndApprovalData() {
         super.saveBizAndApprovalData();
@@ -76,9 +76,13 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
             proofingApply = (ProofingApplyBaseInfo) commonDomainService.loadAndFillinProperties(proofingApply);
         }
         //二次保存不添加id
-        String id = UUID.randomUUID().toString().replace("-", "");
+
         if (proofingApply.getId() == null || proofingApply.getId().isEmpty()) {
+            String id = UUID.randomUUID().toString().replace("-", "");
             proofingApply.setProofingApplyId(id);
+        }else{
+            ProofingApplyBaseInfo one = this.loadProofingApplyById(proofingApply.getId());
+            proofingApply.setProofingApplyId(one.getProofingApplyId());
         }
         //如果录入了ng重新打样原因，则更改状态为不通过
         if(!StringUtil.isBlank(proofingApply.getProofingApplyNgReReason())){
@@ -86,7 +90,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         }
         proofingApply = proofingApplyRepository.save(proofingApply);
 
-//        if(true) return proofingApply.getId();
 
         SDO sdo = this.getBizAndApprovalData();
         String technologyJSON = sdo.getString("technology");
@@ -199,6 +202,4 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     public ProofingApplyBaseInfo selectProofingApplyByProofingApplyNo(String proofingApplyNo) {
         return proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
     }
-
-
 }

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

@@ -22,6 +22,7 @@ import com.huigou.topsun.proofing.repository.proofingMake.*;
 import com.huigou.topsun.util.MyBaseUtil;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
 import com.huigou.util.SDO;
+import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -73,22 +74,26 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
      * 编辑打样制造及相关信息
      * @param sdo 打样制造及相关信息
      */
-//    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @SneakyThrows
     @Override
-    public void saveProofingMake(SDO sdo) throws JsonProcessingException {
+    public Map<String,Object> saveProofingMake(SDO sdo) {
+        HashMap<String, Object> idMap = new HashMap<>();
         ProofingMakeBaseInfo proofingMakeBaseInfo = sdo.toObject(ProofingMakeBaseInfo.class);
         ProofingMakeLooked proofingMakeLooked = sdo.toObject(ProofingMakeLooked.class);
         ProofingMakePdPublishedConf proofingMakePdPublishedConf = sdo.toObject(ProofingMakePdPublishedConf.class);
 
 
-//        proofingMakeBaseInfo.setProofingMakeApplicationStatus(StringUtil.isBlank(proofingMakeBaseInfo.getProofingMakeNgReReason())?"normal":"cancel");
         proofingMakeBaseInfo = proofingMakeRepository.save(proofingMakeBaseInfo);
+        idMap.put("proofingMakeId",proofingMakeBaseInfo.getProofingMakeId());
 
         proofingMakeLooked.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
-        proofingMakeLookedRepository.save(proofingMakeLooked);
+        proofingMakeLooked=proofingMakeLookedRepository.save(proofingMakeLooked);
+        idMap.put("proofingMakeLookedId",proofingMakeLooked.getProofingMakeLookedId());
 
         proofingMakePdPublishedConf.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
-        proofingMakePdPublishedConfRepository.save(proofingMakePdPublishedConf);
+        proofingMakePdPublishedConf=proofingMakePdPublishedConfRepository.save(proofingMakePdPublishedConf);
+        idMap.put("proofingMakePdPublishedConfId",proofingMakePdPublishedConf.getProofingMakePdPublishedConfId());
 
         String technologyJSON = sdo.getString("technology");
         String processJSON = sdo.getString("process");
@@ -138,6 +143,8 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId());
         productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId());
         productPublishedConfRepository.save(productPublishedConf);
+
+        return idMap;
     }
 
     @Override

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -44,7 +45,8 @@ public class WorkInstructionApplicationImpl extends BaseApplication implements W
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public String saveWorkInstruction(SDO sdo) {
+    public Map<String,Object> saveWorkInstruction(SDO sdo) {
+        HashMap<String, Object> idMap = new HashMap<>();
         WorkInstructionBaseInfo workInstruction = sdo.toObject(WorkInstructionBaseInfo.class);
         WorkInstructionPdPublishedConf workInstructionPdPublishedConf = sdo.toObject(WorkInstructionPdPublishedConf.class);
         WorkInstructionMaterialInfo workInstructionMaterialInfo = sdo.toObject(WorkInstructionMaterialInfo.class);
@@ -53,23 +55,29 @@ public class WorkInstructionApplicationImpl extends BaseApplication implements W
         WorkInstructionProductLoss workInstructionProductLoss = sdo.toObject(WorkInstructionProductLoss.class);
 
         WorkInstructionBaseInfo workInstructionBaseInfo = workInstructionRepository.save(workInstruction);
+        idMap.put("workInstructionBaseInfoId",workInstructionBaseInfo.getWorkInstructionBaseInfoId());
 
         workInstructionPdPublishedConf.setWorkInstructionBaseInfoId(workInstructionBaseInfo.getWorkInstructionBaseInfoId());
-        workInstructionPdPublishedConfRepository.save(workInstructionPdPublishedConf);
+        workInstructionPdPublishedConf = workInstructionPdPublishedConfRepository.save(workInstructionPdPublishedConf);
+        idMap.put("workInstructionPdPublishedConfId",workInstructionPdPublishedConf.getWorkInstructionPdPublishedConfId());
 
         workInstructionMaterialInfo.setWorkInstructionBaseInfoId(workInstructionBaseInfo.getWorkInstructionBaseInfoId());
-        workInstructionMaterialInfoRepository.save(workInstructionMaterialInfo);
+        workInstructionMaterialInfo= workInstructionMaterialInfoRepository.save(workInstructionMaterialInfo);
+        idMap.put("workInstructionMaterialInfoId",workInstructionMaterialInfo.getWorkInstructionMaterialInfoId());
 
         workInstructionOptionalAttribute.setWorkInstructionBaseInfoId(workInstructionBaseInfo.getWorkInstructionBaseInfoId());
-        workInstructionOptionalAttributeRepository.save(workInstructionOptionalAttribute);
+        workInstructionOptionalAttribute=workInstructionOptionalAttributeRepository.save(workInstructionOptionalAttribute);
+        idMap.put("workInstructionOptionalAttributeId",workInstructionOptionalAttribute.getWorkInstructionOptionalAttributeId());
 
         workInstructionPrdLooked.setWorkInstructionBaseInfoId(workInstructionBaseInfo.getWorkInstructionBaseInfoId());
-        workInstructionPrdLookedRepository.save(workInstructionPrdLooked);
+        workInstructionPrdLooked=workInstructionPrdLookedRepository.save(workInstructionPrdLooked);
+        idMap.put("workInstructionPrdLookedId",workInstructionPrdLooked.getWorkInstructionPrdLookedId());
 
         workInstructionProductLoss.setWorkInstructionBaseInfoId(workInstructionBaseInfo.getWorkInstructionBaseInfoId());
-        workInstructionProductLossRepository.save(workInstructionProductLoss);
+        workInstructionProductLoss= workInstructionProductLossRepository.save(workInstructionProductLoss);
+        idMap.put("productLossId",workInstructionProductLoss.getProductLossId());
 
-        return workInstructionBaseInfo.getWorkInstructionBaseInfoId();
+        return idMap;
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.huigou.topsun.product.application.ProductLookedApplication;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.application.ProofingMakeApplication;
 
+import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeBaseInfo;
 import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeQueryRequest;
 import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
@@ -94,12 +95,8 @@ 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();
+        Map<String, Object> map = proofingMakeApplication.saveProofingMake(sdo);
+        return toResult(map);
     }
 
 

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

@@ -2,6 +2,7 @@ package com.huigou.topsun.proofing.controller;
 
 import com.huigou.topsun.proofing.application.WorkInstructionApplication;
 import com.huigou.topsun.proofing.domain.vo.WorkInstructionVo;
+import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionBaseInfo;
 import com.huigou.topsun.proofing.domain.workInstruction.query.WorkInstructionBaseInfoQueryRequest;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.client.CommonController;
@@ -54,8 +55,8 @@ public class WorkInstructionController extends CommonController {
 
     public String saveWorkInstruction(){
         SDO sdo = this.getSDO();
-        String workInstructionId = workInstructionApplication.saveWorkInstruction(sdo);
-        return success(workInstructionId);
+        Map<String, Object> map = workInstructionApplication.saveWorkInstruction(sdo);
+        return toResult(map);
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyLooked.java

@@ -36,6 +36,12 @@ public class ProofingApplyLooked implements Serializable {
     @Column(name = "proofing_apply_id")
     private String proofingApplyId;
 
+    /**
+     * 塑胶袋结构
+     */
+    @Column(name = "plastic_bag_structure")
+    private String plasticBagStructure;
+
     /**
      * 是否量产
      */

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

@@ -35,6 +35,12 @@ public class ProofingApplyAndProductQueryRequest extends QueryAbstractRequest {
      */
     private String customerId;
 
+    /**
+     * 品牌客户编号
+     */
+
+    private String customerCode;
+
     /**
      * 品牌编号名称
      */

topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeBaseInfo.java

@@ -66,7 +66,10 @@ public class ProofingMakeBaseInfo implements Serializable {
      */
     @Column(name = "customer_code")
     private String customerCode;
-
+    /**
+     * 版面
+     */
+    private String page;
     /**
      * 版面需求时间
      */
@@ -126,6 +129,12 @@ public class ProofingMakeBaseInfo implements Serializable {
      */
     @Column(name = "proofing_make_product_no")
     private String proofingMakeProductNo;
+    /**
+     * 产品类别名称
+     */
+    @Column(name = "product_category_name")
+    private String productCategoryName;
+
 
     /**
      * 打样形式

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

@@ -2,6 +2,7 @@ package com.huigou.topsun.proofing.domain.vo;
 
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -28,6 +29,11 @@ public class ProofingApplyAndLookedVo {
      * 客户id
      */
     private String customerId;
+    /**
+     * 品牌客户编号
+     */
+
+    private String customerCode;
 
     /**
      * 品牌编号名称
@@ -121,7 +127,10 @@ public class ProofingApplyAndLookedVo {
      *测试标准
      */
     private String isChange;
-
+    /**
+     * 塑胶袋结构
+     */
+    private String plasticBagStructure;
 
     /**
      * 产品类别

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

@@ -2,6 +2,8 @@ package com.huigou.topsun.proofing.domain.vo;
 
 
 import lombok.Data;
+
+import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -51,6 +53,11 @@ public class ProofingMakeVo{
 
     private String customerCode;
 
+    /**
+     * 版面
+     */
+    private String page;
+
     /**
      * 版面需求时间
      */
@@ -111,6 +118,11 @@ public class ProofingMakeVo{
 
     private String proofingMakeProductNo;
 
+    /**
+     * 产品类别名称
+     */
+    private String productCategoryName;
+
     /**
      * 打样形式
      */
@@ -185,6 +197,8 @@ public class ProofingMakeVo{
 
     private String proofingMakeLookedId;
 
+
+
     /**
      * 是否量产
      */

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

@@ -528,9 +528,12 @@ public class WorkInstructionVo {
     /**
      * 仓库(store_name)
      */
+    private String storeName;
+    /**
+     * 采购单位(product_buy_unit)
+     */
     private String productBuyUnit;
 
-
     /**
      * 产品lossID
      */

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

@@ -3,12 +3,13 @@
 
     <query name="slicedQuery" table="proofing_apply">
         <sql-query>
-            select t.* from proofing_apply_base_info t where 1=1
+            select t.* from proofing_apply_base_info t
+<!--            where 1=1-->
         </sql-query>
-        <permissions>
-            <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>
+<!--        <permissions>-->
+<!--            <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>-->
     </query>