申请单修改

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

@@ -29,8 +29,8 @@ function bindQueryEvent() {
  * 流程引擎回调设置打样的id
  * @param value 打样申请的id
  */
-function setId(proofingApplyId) {
-    $("#proofingApplyId").val(proofingApplyId);
+function setId(id) {
+    $("#id").val(id);
 }
 
 /**
@@ -38,7 +38,7 @@ function setId(proofingApplyId) {
  * @return 打样申请的id
  */
 function getId() {
-    return $("#proofingApplyId").val() || "";
+    return $("#id").val() || "";
 }
 
 //获取数据并填充

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

@@ -6,7 +6,6 @@ $(document).ready(function () {
 
 
 function initialize() {
-debugger
     /**
      * 如果是详情页，展示数据，隐藏按钮
      * @type {boolean}
@@ -15,10 +14,13 @@ debugger
     if (isDetailPage) {
         let proofingApplyNo = $("#proofingApplyNo").val();
         if (proofingApplyNo != null && proofingApplyNo !== '') {
-            ajaxRenderDataGoForm(proofingApplyNo);
+            // ajaxRenderDataGoForm(proofingApplyNo);
+            debugger
             showTable({proofingMakeId:$("#proofingMakeId").val()});
         }
-        $("#formButton").hide();
+        // if($("#proofingMakeNo").prop("readonly")){
+        //     $("#formButton").hide();
+        // }
         $("#jobPageTop").hide();
     }
 }
@@ -35,10 +37,6 @@ function bindQueryEvent() {
     });
 }
 
-function save() {
-    debugger
-    saveForm();
-}
 /**
  * 表单提交
  * @returns {boolean}

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

@@ -35,7 +35,7 @@
 
                 <x:hidden name="productId"/>
                 <x:inputC name="productCode" label="产品编号" labelCol="1" fieldCol="2" readonly="true"/>
-                <x:inputC name="customerId"  label="品牌客户编号" labelCol="1" fieldCol="2"/>
+                <x:inputC name="customerCode"  label="品牌客户编号" labelCol="1" fieldCol="2"/>
                 <x:inputC name="proofingMakePageNeedTime"  label="版面需求时间" wrapper="date"
                           labelCol="1" fieldCol="2"/>
                 <x:inputC name="proofingMakeCompleteDate"  id="completeDate"

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

@@ -11,16 +11,17 @@ function initializateUI() {
 
 function loadProofingMakeListGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-        updateHandler: function(){
-            updateHandler();
+        updateHandler: function (){
+            updateHandler()
         },
-        deleteHandler: deleteHandler
+
+        // deleteHandler: deleteHandler
     });
     gridManager = UICtrl.grid("#proofingMakeTableGrid", {
         columns: [
             {display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "申请单号", name: "proofingApplyNo", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "产品编号", name: "productCode", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "品牌客户编号", name: "customerCode", width: 140, minWidth: 60, type: "string", align: "left"},
             {
                 display: "版面需求时间",
@@ -192,19 +193,23 @@ function addHandler() {
     });
 }
 
-function updateHandler(row) {
-    if (!row) {
-        row = DataUtil.getUpdateRow(gridManager);
-        if (!row) {
-            return;
-        }
-    }
-    UICtrl.showAjaxDialog({
-        url: web_app.name + '/proofingMake/forwardDetailsProofingMake.load',
-        title: "修改打样制造单",
-        width: 1500,
-        param: {id: row.proofingMakeId},
-        ok:function (div) {saveForm()}
+function updateHandler() {
+
+      let  row = DataUtil.getUpdateRow(gridManager);
+
+    // UICtrl.showAjaxDialog({
+    //     url: web_app.name + '/proofingMake/forwardDetailsProofingMake.load',
+    //     title: "修改打样制造单",
+    //     width: 1500,
+    //     param: {id: row.proofingMakeId},
+    //     ok:function (div) {
+            // save()
+            UICtrl.addTabItem({
+                tabid: 'updateProofingMake'+row.proofingMakeId,
+                text: "制造单修改",
+                url: web_app.name + '/proofingMake/forwardDetailsProofingMake.do?id='+row.proofingMakeId
+            });
+        // }
         // ok: function (div) {
         //     var _self = this;
         //     $('#submitForm', div).ajaxSubmit({
@@ -215,7 +220,7 @@ function updateHandler(row) {
         //         }
         //     });
     //     }
-    });
+    // });
 }
 
 //重写DataUtil的getUpdateRowId函数、它默认取行的id列

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

@@ -184,11 +184,11 @@ function showTable(params) {
 	let a=key.includes("Apply")?"proofingApply":"proofingMake";
 	technologyObj.parms = { [a+"Id"]: value };
 	let promise = new Promise(function(resolve, reject) {
-		// if (technologyObj.gridManager != null) {
-		// 	reloadGrid(technologyObj);
-		// } else {
+		if (technologyObj.gridManager != null) {
+			reloadGrid(technologyObj);
+		} else {
 		technologyObj=loadProofingApplyGrid(technologyObj);
-		// }
+		}
 		setTimeout(function() {
 			resolve();
 		}, 1200);
@@ -201,15 +201,13 @@ function showTable(params) {
 		let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
 		processObj.parms = {[a+"TechnologyId"]: technologyId}
 		processBomObj.parms = {[a+"TechnologyId"]: technologyId}
-		// if (processObj.gridManager != null) {
-		// 	reloadGrid(processObj);
-		// 	reloadGrid(processBomObj);
-		// } else {
+		if (processObj.gridManager != null) {
+			reloadGrid(processObj);
+			reloadGrid(processBomObj);
+		} else {
 		processObj=loadProofingApplyGrid(processObj);
 		processBomObj=loadProofingApplyGrid(processBomObj);
-		// }
-
-
+		}
 	});
 }
 

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

@@ -10,9 +10,12 @@
       * 如果是详情页，展示数据，隐藏按钮
       * @type {boolean}
       */
+     debugger
      let isDetailPage = ($("#isDetailPage").val() === "true");
      if (isDetailPage) {
-         $("#formButton").hide();
+         // if($("#productCode").prop("readonly")){
+         //     $("#formButton").hide();
+         // }
          $("#jobPageTop").hide();
      }
  }

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

@@ -23,7 +23,13 @@
             </div>
 
             <div class="hg-form-cols">
+                <x:hidden name="workInstructionBaseInfoId"/>
                 <x:hidden name="workInstructionApplyId"/>
+                <x:hidden name="workInstructionMaterialInfoId"/>
+                <x:hidden name="workInstructionOptionalAttributeId"/>
+                <x:hidden name="workInstructionPdPublishedConfId"/>
+                <x:hidden name="workInstructionPrdLookedId"/>
+                <x:hidden name="productLossId"/>
 
                 <x:hidden name="productId"/>
                 <x:inputC name="productCode"  label="产品编号" wrapper="select" labelCol="1" fieldCol="2"/>

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

@@ -12,7 +12,9 @@ function initialize() {
      */
     let isDetailPage = ($("#isDetailPage").val() === "true");
     if (isDetailPage) {
-        $("#formButton").hide();
+        // if($("#productCode").prop("readonly")){
+        //     $("#formButton").hide();
+        // }
         $("#jobPageTop").hide();
     }
 }

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

@@ -81,21 +81,10 @@ function updateHandler(row) {
             return;
         }
     }
-    UICtrl.showAjaxDialog({
-        url: web_app.name + '/workInstructionApply/forwardDetailsWorkInstructionApply.load',
-        title: "修改作业申请指导单",
-        width: 1000,
-        param: {id:row.workInstructionApplyId},
-        ok: function (div) {
-            var _self = this;
-            $('#submitForm', div).ajaxSubmit({
-                url: web_app.name + '/workInstructionApply/saveWorkInstructionApply.ajax',
-                success: function () {
-                    _self.close();
-                    reloadGrid();
-                }
-            });
-        }
+    UICtrl.addTabItem({
+        tabid: 'updateWorkInstructionApply'+row.workInstructionApplyId,
+        text: "作业申请书详情",
+        url: web_app.name + '/workInstructionApply/forwardDetailsWorkInstructionApply.do?id='+row.workInstructionApplyId
     });
 }
 

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

@@ -83,29 +83,31 @@ function resetForm(obj) {
 //     });
 // }
 
-function updateHandler(row) {
-    if (!row) {
-        row = DataUtil.getUpdateRow(gridManager);
-        if (!row) {
-            return;
-        }
-    }
-    UICtrl.showAjaxDialog({
-        url: web_app.name + '/workInstruction/forwardDetailsWorkInstruction.load',
-        title: "修改作业指导单",
-        width: 1500,
-        param: {id: row.workInstructionBaseInfoId},
-        ok: function (div) {
-            var _self = this;
-            $('#submitForm', div).ajaxSubmit({
-                url: web_app.name + '/workInstruction/saveWorkInstruction.ajax',
-                success: function () {
-                    _self.close();
-                    reloadGrid();
-                }
-            });
-        }
+function updateHandler() {
+
+       let row = DataUtil.getUpdateRow(gridManager);
+
+    UICtrl.addTabItem({
+        tabid: 'updateWorkInstruction'+row.workInstructionBaseInfoId,
+        text: "修改作业指导书",
+        url: web_app.name + '/workInstruction/forwardDetailsWorkInstruction.do?id='+row.workInstructionBaseInfoId
     });
+    // UICtrl.showAjaxDialog({
+    //     url: web_app.name + '/workInstruction/forwardDetailsWorkInstruction.load',
+    //     title: "修改作业指导单",
+    //     width: 1500,
+    //     param: {id: row.workInstructionBaseInfoId},
+    //     ok: function (div) {
+    //         var _self = this;
+    //         $('#submitForm', div).ajaxSubmit({
+    //             url: web_app.name + '/workInstruction/saveWorkInstruction.ajax',
+    //             success: function () {
+    //                 _self.close();
+    //                 reloadGrid();
+    //             }
+    //         });
+    //     }
+    // });
 }
 
 

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

@@ -26,7 +26,7 @@ public interface ProofingMakeApplication {
 
     ProofingMakeVo getProofingMakeVoById(String proofingMakeId);
 
-
+    Map<String, Object> mappingReplacementMap(ProofingMakeVo vo) throws IllegalAccessException;
     void deleteProofingMakeById(String id);
     void deleteProofingMakeByIds(List<String> ids);
 }

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

@@ -77,7 +77,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         }
         //二次保存不添加id
         String id = UUID.randomUUID().toString().replace("-", "");
-        if (proofingApply.getProofingApplyId() == null || proofingApply.getProofingApplyId().isEmpty()) {
+        if (proofingApply.getId() == null || proofingApply.getId().isEmpty()) {
             proofingApply.setProofingApplyId(id);
         }
         //如果录入了ng重新打样原因，则更改状态为不通过
@@ -193,26 +193,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         return proofingApplyAndLookedVo;
     }
 
-    /**
-     * 映射打样制造和打样申请 除前缀不一样的字段
-     * @param proofingApply
-     * @throws IllegalAccessException
-     */
-    public void test(ProofingApplyAndLookedVo proofingApply) throws IllegalAccessException {
-        Map<String, Object> proofingMake = new HashMap<>();
-
-        Class<?> proofingApplyClass = proofingApply.getClass();
-        Field[] fields = proofingApplyClass.getDeclaredFields();
 
-        for (Field field : fields) {
-            field.setAccessible(true);
-            String name = field.getName();
-            Object value = field.get(proofingApply);
-            String proofingMakeName = name.replaceFirst("^proofingApply", "proofingMake");
-            proofingMake.put(proofingMakeName, value);
-        }
-
-    }
 
     @Override
     public ProofingApplyBaseInfo selectProofingApplyByProofingApplyNo(String proofingApplyNo) {

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

@@ -14,10 +14,12 @@ import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProces
 import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyTechnology;
 import com.huigou.topsun.proofing.domain.proofingMake.model.*;
 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;
 
 import com.huigou.topsun.proofing.repository.proofingApply.ProofingApplyRepository;
 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 org.springframework.beans.BeanUtils;
@@ -26,6 +28,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.Field;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -69,7 +73,7 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
      * 编辑打样制造及相关信息
      * @param sdo 打样制造及相关信息
      */
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
+//    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public void saveProofingMake(SDO sdo) throws JsonProcessingException {
         ProofingMakeBaseInfo proofingMakeBaseInfo = sdo.toObject(ProofingMakeBaseInfo.class);
@@ -97,26 +101,30 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         /*
          * 将样品的相关工艺工序等删除
          */
-        List<ProofingMakeTechnology> technologiesToDelete = proofingMakeTechnologyRepository.findAllByProofingMakeId(proofingMakeBaseInfo.getProofingApplyId());
+        List<ProofingMakeTechnology> technologiesToDelete = proofingMakeTechnologyRepository.findAllByProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
         if (!technologiesToDelete.isEmpty()) {
             ProofingMakeTechnology technologyToDelete = technologiesToDelete.get(0);
             String proofingMakeTechnologyId = technologyToDelete.getProofingMakeTechnologyId();
-            proofingMakeTechnologyRepository.delete(technologyToDelete);
-            List<ProofingMakeProcess> processesToDelete = proofingMakeProcessRepository.findAllByProofingMakeTechnologyId(proofingMakeTechnologyId);
-            proofingMakeProcessRepository.deleteInBatch(processesToDelete);
 
             List<ProofingMakeProcessMaterial> proofingMakeTechnologyList = proofingMakeProcessMaterialRepository.findAllByProofingMakeTechnologyId(proofingMakeTechnologyId);
             proofingMakeProcessMaterialRepository.deleteInBatch(proofingMakeTechnologyList);
+
+            List<ProofingMakeProcess> processesToDelete = proofingMakeProcessRepository.findAllByProofingMakeTechnologyId(proofingMakeTechnologyId);
+            proofingMakeProcessRepository.deleteInBatch(processesToDelete);
+
+            proofingMakeTechnologyRepository.delete(technologyToDelete);
         }
 
         proofingMakeTechnology.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
         proofingMakeTechnology = proofingMakeTechnologyRepository.save(proofingMakeTechnology);
 
         for (ProofingMakeProcess proofingMakeProcess : ProcessList) {
+            proofingMakeProcess.setProofingMakeProcessId(null);
             proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingMakeTechnologyId());
             proofingMakeProcessRepository.save(proofingMakeProcess);
         }
         for (ProofingMakeProcessMaterial proofingMakeProcessMaterial : processMaterialList) {
+            proofingMakeProcessMaterial.setProofingMakeProcessMaterialId(null);
             proofingMakeProcessMaterial.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingMakeTechnologyId());
             proofingMakeProcessMaterialRepository.save(proofingMakeProcessMaterial);
         }
@@ -139,14 +147,39 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         if (proofingMake==null) return null;
         ProofingMakeLooked proofingMakeLooked = proofingMakeLookedRepository.findByProofingMakeId(proofingMakeId);
         ProofingMakePdPublishedConf proofingMakePdPublishedConf = proofingMakePdPublishedConfRepository.findByProofingMakeId(proofingMakeId);
-//        ProofingApplyBaseInfo proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
-        BeanUtils.copyProperties(proofingMake,proofingMakeVo);
-        BeanUtils.copyProperties(proofingMakeLooked,proofingMakeVo);
-        BeanUtils.copyProperties(proofingMakePdPublishedConf,proofingMakeVo);
-//        BeanUtils.copyProperties(proofingApply,proofingMakeVo);
+        MyBaseUtil.mergeObjects(proofingMakeVo,
+                proofingMake,
+                proofingMakeLooked,
+                proofingMakePdPublishedConf);
         return proofingMakeVo;
     }
 
+    /**
+     * 映射打样制造和打样申请 除前缀不一样的字段
+     * @param vo
+     * @throws IllegalAccessException
+     */
+    public Map<String, Object> mappingReplacementMap(ProofingMakeVo vo) throws IllegalAccessException {
+        Map<String, Object> proofingMake = new HashMap<>();
+
+        Class<?> proofingApplyClass = vo.getClass();
+        Field[] fields = proofingApplyClass.getDeclaredFields();
+
+        for (Field field : fields) {
+            field.setAccessible(true);
+            String name = field.getName();
+            if (!name.equals("proofingApplyId") && !name.equals("proofingApplyNo") && !name.equals("proofingApplyApplicationStatus")) {
+                Object value = field.get(vo);
+                String proofingMakeName = name.replaceFirst("^proofingApply", "proofingMake");
+                proofingMake.put(proofingMakeName, value);
+            } else {
+                Object value = field.get(vo);
+                proofingMake.put(name, value);
+            }
+        }
+        return proofingMake;
+    }
+
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteProofingMakeById(String id) {

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

@@ -77,8 +77,15 @@ public class ProofingMakeController extends CommonController {
         String id = sdo.getId();
         this.putAttribute("isDetailPage","true");
         ProofingMakeVo proofingMakeVo =(id==null||"".equals(id))?null:proofingMakeApplication.getProofingMakeVoById(id);
+
         this.putAttribute("bizId", "proofingMake"+proofingMakeVo.getProofingMakeNo());
-        return forward("proofingMake",proofingMakeVo);
+        Map<String,Object> map=null;
+        try {
+            map=proofingMakeApplication.mappingReplacementMap(proofingMakeVo);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return forward("proofingMake",map);
     }
 
     /**