From 0caed17a984ea21a0b92478f52cf90c101d1085e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 七月 2024 16:08:38 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index a460f79..7e36963 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -229,9 +229,9 @@
null, //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getCAccount(), // 涓讳綋
null, // 瀹㈡埛缂栧彿
- param.getCAccount(), // 瀹㈡埛
+ param.getCCusName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
param.getCMaker(), // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -408,8 +408,18 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
+
if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+ }
+
+ //鍒犻櫎瀛樿揣妗ｆ
+ if(param.deleteFlag == 1){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()){
+ matService.deleteById(matParam.getMatnr());
+ }
+
+ return;
}
for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
@@ -577,7 +587,7 @@
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "鐢熶骇鍏ュ簱鍗�";
param.setcCode(pla.getProOrderNo());
- param.setcAccount(pla.getOwner());
+ param.setcAccount(pla.getWorkshop());
param.setdDate(Utils.getDateStr(new Date()));
param.setType(type);
--
Gitblit v1.9.1