From e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期五, 12 四月 2024 15:32:33 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java index 3b90001..a898137 100644 --- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java +++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java @@ -86,22 +86,30 @@ } //鍒犻櫎鐢熶骇璁㈠崟 - public Boolean deleteOrderWorkSv(String orderId, String productName) { - if (!orderId.isEmpty() && !productName.isEmpty()) { - //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿 - workOrderMapper.deleteOrderWorkMp(orderId, productName); - int state = 0; - int states = 1; - //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟 - Integer noWorkCount = workOrderMapper.selectWorkCount(orderId); - //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁� - Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId); - if (noWorkCount.equals(yesWorkCount)) { - workOrderMapper.updateWorkType(orderId, state); - } else { - workOrderMapper.updateWorkType(orderId, states); + public Boolean deleteOrderWorkSv(String orderId, String productionId) { + if (!orderId.isEmpty() && !productionId.isEmpty()) { + //鏌ヨ璇ヨ鍗曟槸鍚﹀凡缁忓缓绔嬫祦绋嬪崱 + Integer getProcessCard = workOrderMapper.selectProcessCard(orderId); + if (getProcessCard == 0){ + //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿 + workOrderMapper.deleteOrderWorkMp(orderId, productionId); + int state = 0; + int states = 1; + //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟 + Integer noWorkCount = workOrderMapper.selectWorkCount(orderId); + //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁� + Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId); + if (noWorkCount.equals(yesWorkCount)) { + workOrderMapper.updateWorkType(orderId, state); + } else { + workOrderMapper.updateWorkType(orderId, states); + } + return true; } - return true; + else { + return false; + } + } else { return false; } -- Gitblit v1.8.0