From 791e9ce7a627a6c4daa55c1eb1df7158ed88d9e7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 25 五月 2023 10:31:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 b965eab..09ccf77 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -87,6 +87,9 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
+ }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -134,6 +137,7 @@
for (DetlDto detlDto : detlDtos) {
+ String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -149,6 +153,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(param.getOwner());
+ waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -197,6 +203,7 @@
}
}
for (DetlDto detlDto : detlDtos) {
+ String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -213,6 +220,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(param.getOwner());
+ waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -235,6 +244,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() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
@@ -253,6 +263,8 @@
manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
+ manLocDetl.setUuid(uuid);
+ manLocDetl.setOwner(param.getOwner());
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
}
@@ -373,7 +385,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOwner());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
@@ -498,6 +510,7 @@
@Override
public R manDetlIn(JSONObject json) {
Date date = new Date();
+ int jsonOwner= (int) json.get("owner");
String jsonLocNo = (String) json.get("locNo");
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
@@ -528,6 +541,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());
@@ -538,6 +552,8 @@
manLocDetl.setModiTime(date);
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
+ manLocDetl.setUuid(uuid);
+ manLocDetl.setOwner(jsonOwner);
if(!manLocDetlService.insert(manLocDetl)){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
--
Gitblit v1.9.1