From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 ed50a08..52b0e1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -177,6 +177,7 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
+ orderDetl.setPrice(0.0);
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
if (Cools.isEmpty(locOwner)){
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -305,6 +306,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setPrice(0.0);//鍒濆鍖栧凡涓婃姤鏁伴噺
orderDetl.setOwner(detlDto.getOwner());
orderDetl.setBeBatch(detlDto.getBeBatch());
orderDetl.setWeight(detlDto.getWeight());
@@ -421,6 +423,7 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
+ orderDetl.setPrice(0.0);
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
if (Cools.isEmpty(locOwner)){
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -664,7 +667,7 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(param);
+ mat.sync(matParam);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
--
Gitblit v1.9.1