From 4d26b26adb0750aaf8920a9b7613be59711577ca Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 13:26:15 +0800
Subject: [PATCH] #库龄按批次计算
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 f2dc84f..c59eee8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -29,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -968,7 +969,8 @@
if (Cools.isEmpty(jsonLocNo)){
return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
}else if (Cools.isEmpty(ownerId)){
- return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+// return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ ownerId = 1L;
}else if (Cools.isEmpty(jsonCode)){
return R.error("鏉＄爜鍙傛暟涓虹┖锛�");
}else if (Cools.isEmpty(jsonOrigin)){
@@ -1045,6 +1047,12 @@
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
manLocDetl.setOwner(jsonOwner);
+ try {
+ Date produceTime = DateUtils.convert(manLocDetl.getBatch(),DateUtils.yyyyMMdd);
+ manLocDetl.setProduceTime(produceTime);
+ } catch (Exception e) {
+ manLocDetl.setProduceTime(now);
+ }
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1063,7 +1071,8 @@
if (Cools.isEmpty(jsonLocNo)){
return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
}else if (Cools.isEmpty(ownerId)){
- return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+// return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ ownerId = 1L;
}
Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
@@ -1117,7 +1126,12 @@
manLocDetl.setOwner(jsonOwner);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
-
+ try {
+ Date produceTime = DateUtils.convert(jsonOriginDetl.getBatch(),DateUtils.yyyyMMdd);
+ manLocDetl.setProduceTime(produceTime);
+ } catch (Exception e) {
+ manLocDetl.setProduceTime(now);
+ }
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
}
--
Gitblit v1.9.1