From 9455c3adbfcc91166f805371f8009446a230bcde Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:01:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 +++-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index a7b0338..e3c3acb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -387,9 +387,9 @@
if (null == this.inspect){ return null; }
switch (this.inspect){
case 1:
- return "鏄�";
+ return "鍚堟牸";
case 0:
- return "鍚�";
+ return "涓嶅悎鏍�";
default:
return String.valueOf(this.inspect);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index cc8a208..f638366 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -387,9 +387,7 @@
//for (CombParam.CombMat elem : param.getCombMats()) {
CombParam.CombMat elem = combMats.get(i);
CodeDataParam codeDataParam = data.get(i);
- if (!codeDataParam.getQuality().equals(order.getShipCode())) {
- throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
- }
+
elem.setTemp1(codeDataParam.getQuality());
elem.setAnfme(codeDataParam.getQty());
//elem.setBatch(codeDataParam.getBatchNum());
@@ -403,6 +401,9 @@
if (Cools.isEmpty(orderDetl)) {
throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
}
+ if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
+ throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
+ }
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
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 eb8ce0a..d8c57c9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -119,7 +119,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
+ //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -129,6 +129,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
, detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+ dto.setQuality(detail.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -164,6 +165,7 @@
orderDetl.setTemp2(detlDto.getTemp2());
orderDetl.setTemp3(detlDto.getTemp3());
orderDetl.setTemp4(detlDto.getTemp4());
+ orderDetl.setInspect(detlDto.getQuality());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1