From 391c4168a4f6a531aaa2a913c83df4f264d8f439 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 06 八月 2024 19:54:55 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index a0387fe..b74e37d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -554,15 +554,15 @@
bsFormulaChildInfo.setResults("NG");
bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
-// Integer ngTimes = bsFormulaChildInfo.getNgTimes();
-// bsFormulaChildInfo.setNgTimes(ngTimes+1);
-// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
-//
-// if(bsFormulaChildInfo.getNgTimes() > 3){
-// this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
-// WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
-// return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
-// }
+ Integer ngTimes = bsFormulaChildInfo.getNgTimes();
+ bsFormulaChildInfo.setNgTimes(ngTimes+1);
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ if(bsFormulaChildInfo.getNgTimes() > 3){
+ this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
+ return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
+ }
return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}else {
//List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
@@ -600,7 +600,17 @@
String originalString = bsFormulaChildInfo.getTightenTheArray();
String modifiedString = originalString.replaceFirst("OK", "NG");
bsFormulaChildInfo.setCollectData(modifiedString);
+// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ Integer ngTimes = bsFormulaChildInfo.getNgTimes();
+ bsFormulaChildInfo.setNgTimes(ngTimes+1);
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ if(bsFormulaChildInfo.getNgTimes() > 3){
+ this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
+ return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
+ }
return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}
@@ -626,7 +636,7 @@
childInfoTemp.setProcessesCode(childInfo.getProcessesCode());
childInfoTemp.setProductCode(childInfo.getProductCode());
childInfoTemp.setStepSort(childInfo.getStepSort());
-// childInfoTemp.setLineCode(childInfo.getId());
+ childInfoTemp.setChildId(childInfo.getId());
bsFormulaChildInfoTempService.save(childInfoTemp);
}
}
--
Gitblit v1.9.3