From f6cfa006799083136a586b551a3b7eb2dd15aa9f Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期二, 31 十月 2023 17:33:49 +0800
Subject: [PATCH] 库存盘点 暂存和完成盘点
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java | 9 ++++
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 17 ++++++++
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 69 +++++++++++++++++++++++++++++++++-
3 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 3aff362..4e4420d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -135,7 +135,22 @@
}
int num = this.lWhFormInventoryService.temporaryStorage(dto);
- return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
+ }
+
+ /**
+ * 瀹屾垚鐩樼偣
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/31
+ */
+ @PostMapping("/finish")
+ public ResponseValue finishPd(@RequestBody LWhFormInventoryDto dto) {
+ if (dto == null) {
+ return ResponseValue.error("鍙傛暟閿欒");
+ }
+
+ int num = this.lWhFormInventoryService.finishPd(dto);
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
index d353518..f585a74 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
@@ -54,4 +54,13 @@
}
return this.insert(inventoryGoodsList);
}
+
+ /**
+ * @Description 鏍规嵁鐩樼偣鍗昳d鍒犻櫎鐩樼偣鍗曠墿鍝�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ public void delByFormInventoryId(Long id) {
+
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 5076e20..b40b06d 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -165,9 +166,71 @@
*/
public int temporaryStorage(LWhFormInventoryDto dto) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
+ LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
+ if (lWhFormInventory == null) {
+ log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� 澶辫触");
+ return 0;
+ }
+ //2.淇敼鐩樼偣鍗�
+ lWhFormInventory.setStates(1);
+ lWhFormInventory.setInventoryDate(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ int flag1 = this.update(lWhFormInventory);
+ if (flag1 == 0) {
+ log.error("淇敼鐩樼偣鍗� 澶辫触");
+ return 0;
+ }
+ //3.鏇存柊鐩樼偣鍗曠墿鍝�
+ List<LWhFormInventoryGoods> inventoryGoodsList = dto.getInventoryGoodsList();
+ int flag2 = inventoryGoodsService.update(inventoryGoodsList);
+ if (flag2 != inventoryGoodsList.size()) {
+ log.error("鏇存柊鐩樼偣鍗曠墿鍝� 澶辫触");
+ return 0;
+ }
+ return 1;
+ }
- //2.鍒犻櫎鐩樼偣鍗曠墿鍝�
- //3.鏂板鐩樼偣鍗曠墿鍝�
- return 0;
+ /**
+ * 瀹屾垚鐩樼偣
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/31
+ */
+ public int finishPd(LWhFormInventoryDto dto) {
+ //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
+ LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
+ if (lWhFormInventory == null) {
+ log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� 澶辫触");
+ return 0;
+ }
+ //2.淇敼鐩樼偣鍗�
+ lWhFormInventory.setStates(2);
+ lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ int flag1 = this.update(lWhFormInventory);
+ if (flag1 == 0) {
+ log.error("淇敼鐩樼偣鍗� 澶辫触");
+ return 0;
+ }
+ //3.鏇存柊鐩樼偣鍗曠墿鍝�
+ List<LWhFormInventoryGoods> inventoryGoodsList = dto.getInventoryGoodsList();
+ if (CollectionUtils.isEmpty(inventoryGoodsList)) {
+ log.error("鐩樼偣鍗曠墿鍝� 涓虹┖");
+ return 0;
+ }
+ for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
+ int errorCounts = inventoryGoods.getInitCounts() - inventoryGoods.getInventoryCounts();
+ if (errorCounts >0 ) {
+ inventoryGoods.setInventoryResult(3);
+ } else if (errorCounts <0){
+ inventoryGoods.setInventoryResult(2);
+ } else {
+ inventoryGoods.setInventoryResult(1);
+ }
+ inventoryGoods.setErrorCounts(errorCounts);
+ }
+ int flag2 = inventoryGoodsService.update(inventoryGoodsList);
+ if (flag2 != inventoryGoodsList.size()) {
+ log.error("鏇存柊鐩樼偣鍗曠墿鍝� 澶辫触");
+ return 0;
+ }
+ return 1;
}
}
--
Gitblit v1.9.1