From 3e015fc9d05c451d34fd33e846349d4b2bd7b600 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 09 六月 2023 11:11:03 +0800
Subject: [PATCH] #删除uuid
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
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 9558c78..5101c8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -201,7 +201,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -230,7 +230,7 @@
waitPakin.setModiTime(now);
waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
- waitPakin.setWeight(param.getCombMats().get(0).getWeight());
+ waitPakin.setWeight(detlDto.getWeight());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -253,7 +253,7 @@
// 鑾峰彇鍟嗗搧鍒楄〃
for(CombParam.CombMat combMat : param.getCombMats()){
- String uuid = String.valueOf(System.currentTimeMillis());
+
Mat mat = matService.selectByMatnr(combMat.getMatnr());
if (Cools.isEmpty(mat)){
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
@@ -272,7 +272,6 @@
manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
- manLocDetl.setUuid(uuid);
manLocDetl.setOwner(1);
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
@@ -549,7 +548,7 @@
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
if (checkManLocDetl == null) {
- String uuid = String.valueOf(System.currentTimeMillis());
+
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
manLocDetl.setLocNo(node.getName());
@@ -560,7 +559,6 @@
manLocDetl.setModiTime(date);
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
- manLocDetl.setUuid(uuid);
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
if(!manLocDetlService.insert(manLocDetl)){
--
Gitblit v1.9.1