展示与修改页

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

@@ -35,12 +35,16 @@ function bindQueryEvent() {
     });
 }
 
+function save() {
+    debugger
+    saveForm();
+}
 /**
  * 表单提交
  * @returns {boolean}
  */
 function saveForm() {
-
+    debugger
    let extendedData= getTableResult();
 
    if(!extendedData) return false;

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

@@ -4,7 +4,7 @@
 <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/technologyAndBom/technologyAndBom.js'/>
+<%--<x:script src='/biz/topsun/proofing/technologyAndBom/technologyAndBom.js'/>--%>
 <x:script src='/biz/topsun/proofing/proofingMake.js'/>
 <div class="container-fluid" style="padding: 10px;">
     <x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
@@ -26,6 +26,8 @@
 <%--                <x:hidden name="bizId"/>--%>
                 <x:hidden name="proofingMakeId"/>
                 <x:hidden name="proofingApplyId"/><!--申请单id-->
+                <x:hidden name="proofingMakeLookedId"/>
+                <x:hidden name="proofingMakePdPublishedConfId"/>
 
                 <x:inputC name="proofingMakeNo"  label="制造单号" labelCol="1" fieldCol="2"/>
 

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

@@ -204,16 +204,17 @@ function updateHandler(row) {
         title: "修改打样制造单",
         width: 1500,
         param: {id: row.proofingMakeId},
-        ok: function (div) {
-            var _self = this;
-            $('#submitForm', div).ajaxSubmit({
-                url: web_app.name + '/proofingMake/saveProofingMake.ajax',
-                success: function () {
-                    _self.close();
-                    reloadGrid();
-                }
-            });
-        }
+        ok:function (div) {saveForm()}
+        // ok: function (div) {
+        //     var _self = this;
+        //     $('#submitForm', div).ajaxSubmit({
+        //         url: web_app.name + '/proofingMake/saveProofingMake.ajax',
+        //         success: function () {
+        //             _self.close();
+        //             reloadGrid();
+        //         }
+        //     });
+        // }
     });
 }
 

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

@@ -129,15 +129,7 @@ function loadProofingApplyGrid(obj) {
 		},
 		deleteHandler: function () {
 			var _grid = UICtrl.getGridManager('#'+obj.node);
-			DataUtil.delSelectedRows({
-				action: 'technologyProcess/deleteTechnologyProcess.ajax',
-				param: {},
-				gridManager: _grid,
-				idFieldName: obj.node,
-				onSuccess: function () {
-					reloadGrid();
-				}
-			});
+			_grid.deleteSelectedRow();//删除选定节点
 		}
 	});
 	obj.gridManager =  UICtrl.grid("#"+obj.node, {
@@ -157,8 +149,26 @@ function loadProofingApplyGrid(obj) {
 		selectRowButtonOnly: true
 	});
 	UICtrl.setSearchAreaToggle(obj.gridManager);
+	return  obj;
+
 }
 
+
+
+// function addObserver(eleId) {
+// 	observer.observe(document.querySelector(eleId), mutationConfig);
+// }
+//
+// const observer = new MutationObserver((mutations) => {
+// 	mutations.forEach((mutation) => {
+// 		if(mutation.type === 'childList' && mutation.addedNodes.length > 0 &&mutation.addedNodes[0].nodeName === "DIV") {
+// 			debugger;
+// 		}
+// 	})
+// })
+// const mutationConfig = { attributes: true, childList: true, subtree: true}
+
+
 /**
  * 详情页初始化调用
  * 获取申请或制造单的工艺工序等数据生成表格
@@ -167,18 +177,18 @@ function loadProofingApplyGrid(obj) {
 function showTable(params) {
 	 isDetail=true;
 	// 根据传入的参数确定使用哪个ID
-	let key = Object.keys(params)[0]; // 获取传入对象的第一个key
-	let value = params[key]; // 获取对应的value
+	let key = Object.keys(params)[0];
+	let value = params[key];
 
 	// 根据key来确定是"apply"还是"make"
 	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 {
-			loadProofingApplyGrid(technologyObj);
-		}
+		// if (technologyObj.gridManager != null) {
+		// 	reloadGrid(technologyObj);
+		// } else {
+		technologyObj=loadProofingApplyGrid(technologyObj);
+		// }
 		setTimeout(function() {
 			resolve();
 		}, 1200);
@@ -191,13 +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 {
-			loadProofingApplyGrid(processObj);
-			loadProofingApplyGrid(processBomObj);
-		}
+		// if (processObj.gridManager != null) {
+		// 	reloadGrid(processObj);
+		// 	reloadGrid(processBomObj);
+		// } else {
+		processObj=loadProofingApplyGrid(processObj);
+		processBomObj=loadProofingApplyGrid(processBomObj);
+		// }
 
 
 	});
@@ -277,7 +287,7 @@ function technologyClickRequestProcess(){
  * @returns {{}|boolean}
  */
 function getTableResult(){
-
+	debugger
 	let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
 
 	let processResult =processObj.gridManager.getSelectedRows();

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

@@ -115,7 +115,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
             ProofingApplyTechnology technologyToDelete = technologiesToDelete.get(0);
             String proofingApplyTechnologyId = technologyToDelete.getProofingApplyTechnologyId();
             proofingTechnologyRepository.delete(technologyToDelete);
-            List<ProofingApplyProcess> processesToDelete = proofingApplyProcessRepository.findByProofingApplyTechnologyId(proofingApplyTechnologyId);
+            List<ProofingApplyProcess> processesToDelete = proofingApplyProcessRepository.findAllByProofingApplyTechnologyId(proofingApplyTechnologyId);
             proofingApplyProcessRepository.deleteInBatch(processesToDelete);
 
             List<ProofingApplyProcessMaterial> ProofingApplyTechnologyList = proofingApplyProcessMaterialRepository.findByProofingApplyTechnologyId(proofingApplyTechnologyId);

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

@@ -9,7 +9,9 @@ import com.huigou.topsun.product.repository.ProductLookedRepository;
 import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
 import com.huigou.topsun.proofing.application.ProofingMakeApplication;
 
+import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcess;
 import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcessMaterial;
+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.ProofingMakeVo;
@@ -92,6 +94,21 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         List<ProofingMakeProcess> ProcessList = objectMapper.readValue(processJSON, new TypeReference<List<ProofingMakeProcess>>() {});
         List<ProofingMakeProcessMaterial> processMaterialList = objectMapper.readValue(processMaterialJSON, new TypeReference<List<ProofingMakeProcessMaterial>>() {});
 
+        /*
+         * 将样品的相关工艺工序等删除
+         */
+        List<ProofingMakeTechnology> technologiesToDelete = proofingMakeTechnologyRepository.findAllByProofingMakeId(proofingMakeBaseInfo.getProofingApplyId());
+        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);
+        }
+
         proofingMakeTechnology.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
         proofingMakeTechnology = proofingMakeTechnologyRepository.save(proofingMakeTechnology);
 

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

@@ -61,10 +61,10 @@ public class ProofingTechnologyRelevancyController extends CommonController {
         ProofingMakeTechnologyQueryRequest proofingMakeTechnologyQueryRequest = sdo.toQueryRequest(ProofingMakeTechnologyQueryRequest.class);
         Map<String, Object> map = new HashMap<>();
         //判断需要展示产品工艺还是打样表中工艺
-        if(!StringUtil.isBlank(proofingApplyTechnologyQueryRequest.getProofingApplyId())){
-            map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
-        }else if(!StringUtil.isBlank(queryRequest.getProductId())){
+        if(!StringUtil.isBlank(queryRequest.getProductId())){
             map = technologyApplication.slicedTechnologyList(queryRequest);
+        }else if(!StringUtil.isBlank(proofingApplyTechnologyQueryRequest.getProofingApplyId())){
+            map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
         }else  if(!StringUtil.isBlank(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
             map=proofingMakeTechnologyApplication.slicedProofingMakeTechnology(proofingMakeTechnologyQueryRequest);
         }

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstructionApply/model/WorkInstructionApply.java

@@ -2,6 +2,7 @@ package com.huigou.topsun.proofing.domain.workInstructionApply.model;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import lombok.Data;
@@ -12,6 +13,7 @@ import lombok.Data;
  */
 @Table(name="work_instruction_apply")
 @Data
+@Entity
 public class WorkInstructionApply implements Serializable {
     /**
      * 作业指导申请书id

topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyProcessRepository.java

@@ -6,5 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 
 public interface ProofingApplyProcessRepository extends JpaRepository<ProofingApplyProcess, String> {
-    List<ProofingApplyProcess> findByProofingApplyTechnologyId(String proofingApplyTechnologyId);
+    List<ProofingApplyProcess> findAllByProofingApplyTechnologyId(String proofingApplyTechnologyId);
+
 }

topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeProcessMaterialRepository.java

@@ -4,5 +4,9 @@ package com.huigou.topsun.proofing.repository.proofingMake;
 import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeProcessMaterial;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface ProofingMakeProcessMaterialRepository extends JpaRepository<ProofingMakeProcessMaterial, String> {
+
+    List<ProofingMakeProcessMaterial> findAllByProofingMakeTechnologyId(String proofingMakeTechnologyId);
 }