修复已知问题

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

@@ -158,55 +158,14 @@ function loadProofingApplyGrid(obj) {
  * 获取工艺工序等数据生成表格
  * @param proofingApplyId
  */
-// async function showTable(params) {
-// 	isDetail = true;
-//
-// 	// 根据传入的参数确定使用哪个ID
-// 	let key = Object.keys(params)[0]; // 获取传入对象的第一个key
-// 	let value = params[key]; // 获取对应的value
-//
-// 	// 根据key来确定是"apply"还是"make"
-// 	let isApply = key.includes("Apply");
-// 	let isMake = key.includes("Make");
-//
-// 	if (!(isApply || isMake)) {
-// 		throw new Error("Invalid parameter. Expected keys: 'proofingApplyId' or 'proofingMakeId'");
-// 	}
-//
-// 		technologyObj.parms = { [key]: value };
-//
-// 	try {
-// 		// 等待loadProofingApplyGrid执行完毕
-// 		await loadProofingApplyGrid(technologyObj);
-//
-// 		let technologyResult = DataUtil.getGridData({
-// 			gridManager: technologyObj.gridManager,
-// 			isAllData: true
-// 		});
-// 		let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
-// 		processObj.parms = { proofingApplyTechnologyId: proofingApplyTechnologyId };
-//
-// 		if (processObj.gridManager != null) {
-// 			await reloadGrid(processObj);
-// 		} else {
-// 			await loadProofingApplyGrid(processObj);
-// 		}
-// 	} catch (error) {
-// 		console.error("Error in loadProofingApplyGrid or its Promise:", error);
-// 	}
-// }
 function showTable(params) {
-
 	 isDetail=true;
-
 	// 根据传入的参数确定使用哪个ID
 	let key = Object.keys(params)[0]; // 获取传入对象的第一个key
 	let value = params[key]; // 获取对应的value
 
 	// 根据key来确定是"apply"还是"make"
-	// let isApply = key.includes("Apply");
 	let a=key.includes("Apply")?"proofingApply":"proofingMake";
-	// technologyObj.parms = {proofingApplyId: proofingApplyId}
 	technologyObj.parms = { [a+"Id"]: value };
 	let promise = new Promise(function(resolve, reject) {
 		if (technologyObj.gridManager != null) {
@@ -218,15 +177,12 @@ function showTable(params) {
 			resolve();
 		}, 1000);
 	});
-
 	promise.then(function() {
 		let technologyResult = DataUtil.getGridData({
 			gridManager: technologyObj.gridManager,
 			isAllData: true
 		});
-		// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
 		let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
-		// processObj.parms = {proofingApplyTechnologyId: proofingApplyTechnologyId}
 		processObj.parms = {[a+"TechnologyId"]: technologyId}
 		if (processObj.gridManager != null) {
 			reloadGrid(processObj);
@@ -236,49 +192,6 @@ function showTable(params) {
 	});
 }
 
-function showTable1(params){
-
-	debugger
-	isDetail = true;
-
-	// 根据传入的参数确定使用哪个ID
-	let key = Object.keys(params)[0]; // 获取传入对象的第一个key
-	let value = params[key]; // 获取对应的value
-
-	// 根据key来确定是"apply"还是"make"
-	// let isApply = key.includes("Apply");
-	let a=key.includes("Apply")?"proofingApply":"proofingMake";
-	//
-	// let isMake = key.includes("Make");
-	//
-	// if (!(isApply || isMake)) {
-	// 	throw new Error("Invalid parameter. Expected keys: 'proofingApplyId' or 'proofingMakeId'");
-	// }
-
-	technologyObj.parms = { [a+"Id"]: value };
-	//technologyObj.parms = {proofingApplyId: proofingApplyId}
-	if(technologyObj.gridManager!=null) {
-		reloadGrid(technologyObj);
-	}else{
-		loadProofingApplyGrid(technologyObj);
-	}
-	setTimeout(function() {
-
-		let technologyResult = DataUtil.getGridData({
-			gridManager: technologyObj.gridManager,
-			isAllData: true
-		});
-		// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
-		let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
-		processObj.parms = {[a]: technologyId}
-
-		if (processObj.gridManager != null) {
-			reloadGrid(processObj);
-		} else {
-			loadProofingApplyGrid(processObj);
-		}
-	},1000)
-}
 
 
 //展示工艺表格
@@ -304,12 +217,7 @@ $(document).ready(function() {
 	technologyClickRequestProcess();
 	UICtrl.layout("#layout",{
 		leftWidth:2,
-		// // centerWidth:2,
 		rightWidth:5,
-		// allowRightResize:false,
-		// allowRightCollapse:false,
-		// allowLeftResize:false,
-		// allowLeftCollapse:false
 	})
 });
 
@@ -342,31 +250,6 @@ function technologyClickRequestProcess(){
 				loadProofingApplyGrid(processObj);
 			}
 		}, 0);
-
-		// 延迟执行点击事件逻辑
-		// setTimeout(function() {
-		// 	let result = DataUtil.getUpdateRow(gridManager); // 获取选中行
-		// 	processObj.parms = { technologyId: result.technologyId };
-		// 	if (processObj.gridManager != null) {
-		// 		gridManager = processObj.gridManager; // 手动切换 gridManager
-		// 		reloadGrid({ technologyId: result.technologyId });
-		// 	} else {
-		// 		loadProofingApplyGrid(processObj);
-		// 	}
-		// }, 0);
 	});
-	// $(document).on('click', '#process .l-grid-row', function(event) {
-	// 	setTimeout(function() {
-	// 		debugger
-	// 		let result = DataUtil.getUpdateRow(processObj.gridManager); // 获取选中行
-	// 		processBomObj.parms = { processId: result.processId };
-	// 		if (processBomObj.gridManager != null) {
-	// 			reloadGrid(processBomObj);
-	// 		} else {
-	// 			loadProofingApplyGrid(processBomObj);
-	// 		}
-	// 	}, 0);
-	//
-	// });
 
 }

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

@@ -95,7 +95,7 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         proofingMakeTechnology = proofingMakeTechnologyRepository.save(proofingMakeTechnology);
 
         for (ProofingMakeProcess proofingMakeProcess : ProcessList) {
-            proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingTechnologyId());
+            proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingMakeTechnologyId());
             proofingMakeProcessRepository.save(proofingMakeProcess);
         }
 

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

@@ -17,6 +17,7 @@ import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.client.CommonController;
 import com.huigou.util.SDO;
+import com.huigou.util.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -123,11 +124,11 @@ public class ProofingApplyController extends CommonController {
         ProofingMakeTechnologyQueryRequest proofingMakeTechnologyQueryRequest = sdo.toQueryRequest(ProofingMakeTechnologyQueryRequest.class);
         Map<String, Object> map = new HashMap<>();
         //判断需要展示产品工艺还是打样表中工艺
-        if(proofingApplyTechnologyQueryRequest.getProofingApplyId()!=null&&!proofingApplyTechnologyQueryRequest.getProofingApplyId().equals("")){
+        if(!StringUtil.isBlank(proofingApplyTechnologyQueryRequest.getProofingApplyId())){
             map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
-        }else if(queryRequest.getProductId()!=null&&!queryRequest.getProductId().equals("")){
+        }else if(!StringUtil.isBlank(queryRequest.getProductId())){
             map = technologyApplication.slicedTechnologyList(queryRequest);
-        }else if(proofingMakeTechnologyQueryRequest.getProofingMakeId()!=null&&!"".equals(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
+        }else if(!StringUtil.isBlank(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
             map=proofingMakeTechnologyApplication.slicedProofingMakeTechnology(proofingMakeTechnologyQueryRequest);
         }
         return toResult(map);
@@ -144,11 +145,11 @@ public class ProofingApplyController extends CommonController {
         ProofingApplyProcessQueryRequest proofingApplyProcessQueryRequest = sdo.toQueryRequest(ProofingApplyProcessQueryRequest.class);
         ProofingMakeProcessQueryRequest proofingMakeProcessQueryRequest = sdo.toQueryRequest(ProofingMakeProcessQueryRequest.class);
         //判断需要展示产品工序还是打样表中工序
-        if(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId()!=null&&!proofingApplyProcessQueryRequest.getProofingApplyTechnologyId().equals("")){
+        if(!StringUtil.isBlank(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId())){
            return toResult(proofingApplyProcessApplication.slicedProofingApplyProcess(proofingApplyProcessQueryRequest));
-        }else if(technologyId!=null&&!technologyId.equals("")){
+        }else if(!StringUtil.isBlank(technologyId)){
             return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
-        }else  if(proofingMakeProcessQueryRequest.getProofingMakeTechnologyId()!=null&&!proofingMakeProcessQueryRequest.getProofingMakeTechnologyId().equals("")){
+        }else  if(!StringUtil.isBlank(proofingMakeProcessQueryRequest.getProofingMakeTechnologyId())){
             return toResult(proofingMakeProcessApplication.slicedProofingMakeProcess(proofingMakeProcessQueryRequest));
         }
         return toResult(null);

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

@@ -27,8 +27,8 @@ public class ProofingMakeTechnology implements Serializable {
             name = "system-uuid",
             strategy = "guid"
     )
-    @Column(name = "proofing_apply_technology_id")
-    private String proofingTechnologyId;
+    @Column(name = "proofing_make_technology_id")
+    private String proofingMakeTechnologyId;
 
     /**
      * 工艺id

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

@@ -14,7 +14,7 @@ public class ProofingMakeTechnologyQueryRequest  extends QueryAbstractRequest {
      * 打样工艺id
      */
 
-    private String proofingTechnologyId;
+    private String proofingMakeTechnologyId;
 
     /**
      * 工艺id