From 06e2ce23ba5944161e5bd32dd2ac63a6aee60013 Mon Sep 17 00:00:00 2001
From: 杨凯 <398860375@qq.com>
Date: 星期三, 18 十月 2023 12:03:27 +0800
Subject: [PATCH] 数据库WH_GOODS删除调拨数量，总数量。在调拨时重新生成调拨物品WH_GOODS表中重新生成记录。
---
consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
index e321550..324bf71 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
@@ -6,9 +6,11 @@
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
+import java.util.ArrayList;
import java.util.List;
@@ -33,20 +35,21 @@
/**
* 缁熶竴鍑哄叆搴�
*/
- public CheckWarehouseResult[] unifyCheck(CheckWarehouseParam param) {
+ public List<CheckWarehouseResult> unifyCheck(CheckWarehouseParam param) {
// TODO: 10/10/2023 姝ゅ鍔犱簡鍞竴閿侊紝浼氬奖鍝嶆�ц兘锛屾�濊�冩槸鍚︽湁鏇村悎閫傜殑鍔炴硶
try {
Assert.notNull(param, "wareHouse param can not null !");
Assert.notNull(param.getWarehouseId(), "wareHouse id can not null");
- CheckWarehouseResult[] result;
+ List<CheckWarehouseResult> results;
synchronized (param.getWarehouseId()) {
if (param.getIsCheckIn()) {
- result = new CheckWarehouseResult[]{checkin(param)};
+ results = new ArrayList<>();
+ results.add(checkin(param));
} else {
- result = checkout(param);
+ results = checkout(param);
}
}
- return result;
+ return results;
} catch (Exception e) {
log.error(e.getMessage());
throw new RuntimeException(e.getMessage());
@@ -57,7 +60,8 @@
/**
* 鍑哄簱
*/
- private CheckWarehouseResult[] checkout(CheckWarehouseParam param) {
+ private List<CheckWarehouseResult> checkout(CheckWarehouseParam param) {
+ //鏌ヨ鍑烘寚瀹氫粨搴撱�佹寚瀹氬瀷鍙凤紝鐘舵�佷负姝ｅ父鐨勭殑搴撳瓨鐗╁搧锛屾寜鐓ч噰璐椂闂村�掑彊銆佷环鏍煎�掑彊鎺掑垪
String sql = "SELECT\n" +
" * \n" +
"FROM\n" +
@@ -72,14 +76,69 @@
parameter.add("WAREHOUSE_ID",param.getWarehouseId())
.add("BASE_GOODS_MODELS_ID",param.getModelId());
List<WhGoods> goodsList = select(sql,parameter,new WhGoods());
+ List<CheckWarehouseResult> resultList = new ArrayList<>();
+
+ int shengyu = param.getCount();
for (WhGoods goods : goodsList){
+ if (shengyu <= 0 ) break;
+ //濡傛灉搴撳瓨鏁伴噺澶т簬鍑哄簱鏁伴噺锛岀洿鎺ュ噺搴撳瓨
+ if (shengyu <= goods.getWhCount()){
+ shengyu = 0;
+
+ CheckWarehouseResult result = new CheckWarehouseResult();
+ result.setWhGoods(goods);
+ result.setInitial_count(goods.getWhCount());
+ goods.setWhCount(goods.getWhCount() - param.getCount());
+ result.setEnd_count(goods.getWhCount());
+ resultList.add(result);
+
+ //濡傛灉鍑忓簱瀛樺悗锛屽簱瀛樻暟涓�0锛屽垯鍙樻洿鐘舵�佷负宸插垹闄�
+ if (goods.getWhCount() == 0){
+ goods.setStates(0);
+ }
+ update(goods);
+
+ //濡傛灉鏄皟鎷ㄥ嚭搴� 2:璋冩嫧锛�3锛氭姤搴�
+ if (param.getOutput_type() == 2 || param.getOutput_type() == 3){
+ WhGoods nGoods = new WhGoods();
+ BeanUtils.copyProperties(goods,nGoods);
+ //鍙樻洿鐘舵�佷负璋冩嫧
+ nGoods.setStates(param.getOutput_type());
+ nGoods.setWhCount(param.getCount());
+ nGoods.setId(NumberGenerator.getLongSequenceNumber());
+ insert(nGoods);
+
+ CheckWarehouseResult nresult = new CheckWarehouseResult();
+ nresult.setWhGoods(nGoods);
+ nresult.setInitial_count(0);
+ nresult.setEnd_count(nresult.getEnd_count());
+ resultList.add(nresult);
+ }
+
+ return resultList;
+
+ }
+
+ //濡傛灉搴撳瓨鏁伴噺灏忎簬鍑哄簱鏁伴噺锛屽垯闇�瑕佸嚑涓簱瀛樼墿鍝佷竴璧峰嚭搴撱��
+
+ CheckWarehouseResult result = new CheckWarehouseResult();
+ result.setInitial_count(goods.getWhCount());
+ result.setEnd_count(0);
+ result.setWhGoods(goods);
+ resultList.add(result);
+
+ shengyu = param.getCount() - goods.getWhCount();
+ if (shengyu < 0){
+ throw new RuntimeException("鍑哄簱鏃讹紝璁＄畻閿欒");
+ }
+ goods.setWhCount(0);
+ goods.setStates(0);
+ update(goods);
}
-
-
- return null;
+ throw new RuntimeException("鍑哄簱鏃讹紝璁＄畻閿欒");
}
private BaseWarehouse getWarehouse(long id){
@@ -104,8 +163,6 @@
goods.setBaseGoodsModelsId(procureModel.getBaseGoodsModelsId());
goods.setBaseGoodsModelsName(procureModel.getBaseGoodsModelsName());
goods.setWhCount(procureModel.getCounts());
- goods.setTransferCount(0);
- goods.setAllCount(procureModel.getCounts());
goods.setFirstInputCode(param.getFirstInputCode());
goods.setFirstInputType(param.getFirst_input_type());
goods.setFirstInputHisId(NumberGenerator.getLongSequenceNumber());
@@ -122,7 +179,7 @@
CheckWarehouseResult result = new CheckWarehouseResult();
result.setWhGoods(goods);
result.setInitial_count(0);
- result.setEnd_count(goods.getAllCount());
+ result.setEnd_count(goods.getWhCount());
return result;
//闆舵槦鍏ュ簱
} else if (param.getFirst_input_type() ==2){
@@ -161,7 +218,6 @@
WhGoods newGoods = new WhGoods();
newGoods.setId(goods.getId());
newGoods.setWhCount(result.getEnd_count());
- newGoods.setAllCount(goods.getAllCount() + param.getCount());
newGoods.setStates(1);
newGoods.setBackDate(DateUtil.getCurrentDateFor14());
this.update(newGoods);
--
Gitblit v1.9.1