From 31a66e92c9eaa413c794e1183f4a86de4b9cc532 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 25 三月 2025 14:53:24 +0800
Subject: [PATCH] 提交相关报工转移程序代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 1ab73e9..c95d452 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
@@ -899,6 +899,13 @@
List<OrderNumberTransferDTO> orderNumberTransferList = new ArrayList<>();
oldOrderProcessDetailForReport.forEach(oldOrderProcessDetail -> {
+ //淇敼鎶ュ伐鐘舵�佷负3
+ reportingWorkMapper.update(null,new UpdateWrapper<ReportingWork>()
+ .set("reviewed_state",3)
+ .eq("process_id",oldOrderProcessDetail.getProcessId())
+ );
+
+
int maxNum = 0;
for(OrderProcessDetail newOrderProcessDetail : newOrderProcessDetailList){
if(oldOrderProcessDetail.getReportingWorkNum() == 0){
@@ -914,10 +921,13 @@
.eq("order_number", newOrderProcessDetail.getOrderNumber())
.eq("technology_number",newOrderProcessDetail.getTechnologyNumber())
);
- maxNum = thisFlowCard.getQuantity();
+ maxNum = thisFlowCard.getQuantity()+thisFlowCard.getExportNumber()
+ -thisFlowCard.getImportNumber();
}else{
- //褰撲笉鏄涓�閬撳伐搴忓垯锛屾嬁涓婁竴閬撳伐搴忎綔涓烘渶澶у��
- maxNum = orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()-1).getReportingWorkNum();
+ //褰撲笉鏄涓�閬撳伐搴忓垯锛屾嬁涓婁竴閬撳伐搴忓噺鍘诲綋鍓嶅伐搴忎綔涓烘渶澶у��
+ maxNum = orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()-1).getReportingWorkNum()
+ -orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()).getReportingWorkNum()
+ ;
}
//鍒ゆ柇琚浆绉荤殑鏁伴噺鏄惁澶т簬鍙浆绉荤殑鏁伴噺鏈�澶у��
int transferNum = 0;
@@ -1007,7 +1017,8 @@
if(response.getStatusCode() == HttpStatus.OK){
return true;
}else{
- return "mes鍝嶅簲瓒呮椂";
+ return "杩炴帴mes鍝嶅簲瓒呮椂";
}
+
}
}
--
Gitblit v1.8.0