From 1f047af0b1a42dcb43090890e212365a988dfa72 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 八月 2023 15:51:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index a6082f3..f649584 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -389,9 +389,6 @@
dealAppliancePro(mp,user,allRecordList,updateApplianceList,updateApplianceProList, outboundDetailList,stockList);
}
- if(1==1){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"123");
- }
//濡傛灉鏈夋病bom閰嶇疆,妫�鏌ヤ骇鍑猴紙鍖呭惈妫�楠岀殑涓嶈壇鍜屾姤搴熷搧锛夊拰鎶曟枡鏁伴噺鏄惁鐩哥瓑鍖归厤锛屼笉涓�鑷存彁绀洪敊璇�
if(bdparam==null){
@@ -512,6 +509,7 @@
//濡傛灉闇�瑕佹姇鏂欑殑鐗╂枡闆嗗悎锛屽湪搴撳瓨涓鎵炬姇鏂欐潵婧�
for(WStock model : materialList){
for(WStock ts : allList){
+
if(Constants.equalsInteger(model.getMaterialId(),ts.getMaterialId())){
//杩橀渶瑕佹姇鏂欐暟閲�
BigDecimal actNum = Constants.formatBigdecimal(model.getNum()).subtract(Constants.formatBigdecimal(model.getTNum()));
@@ -527,6 +525,10 @@
//濡傛灉宸茬粡婊¤冻鍓╀綑闇�姹傞噺
isfull =true;
}
+
+ //娣诲姞鎶曟枡璁板綍
+ workorderRecordExtMapper.insert(getWorkrecordModel(user,ts,mp,actNum));
+
//鏇存柊宸茬粡鎶曟枡鏁伴噺
model.setTNum(Constants.formatBigdecimal(model.getTNum()).add(actNum));
WOutbound outbound = getFromOutboundList(ts.getWarehouseId(),outboundList);
--
Gitblit v1.9.3