From e9e776e4ad2f191496defcca1a0250b2c49c9f4f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 二月 2025 16:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index aa21b3d..3202b26 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -675,13 +675,38 @@
JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
ReportingWorkDetail reportingWorkDetail =JSON.parseObject(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());
+
+ int index = technologicalProcess.indexOf("-");
+ String interceptProcess = "";
+ if (index <0){
+ interceptProcess = technologicalProcess;
+ }
+ else {
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ interceptProcess = technologicalProcess.substring(0, index);
+ }
+ int processNum =0;
+ if (interceptProcess.equals(reportingWork.getThisProcess())) {
+ processNum = reportingWorkMapper.selectFlowCardNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ }else{
+ processNum = reportingWorkMapper.selectGlassProcessNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ }
+
//鑾峰彇鍙姤鏁伴噺
- int processNum = reportingWorkMapper.selectGlassProcessNum(
- reportingWorkDetail.getOrderNumber(),
- reportingWorkDetail.getTechnologyNumber(),
- reportingWork.getProcessId(),
- reportingWork.getThisProcess()
- );
+
//鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
return false;
--
Gitblit v1.8.0