From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java
index 0671b37..36f8868 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java
@@ -68,6 +68,9 @@
@Autowired
private IInboundDetailService inboundDetailService;
+
+ @Autowired
+ private IGoodsShelvesService goodsShelvesService;
@Override
public boolean submit(String id) {
InboundOrder inboundOrder = this.getById(id);
@@ -215,6 +218,7 @@
@Override
public void addInStorage(JSONObject jSONObject) {
String inStorehouseType = jSONObject.getString("inStorehouseType");
+ String locationCodeId = jSONObject.getString("locationCodeId");
String classifyId = jSONObject.getString("classifyId");
Date inboundTime = jSONObject.getDate("inboundTime");
//鑾峰彇鍏ュ簱鏄庣粏
@@ -258,6 +262,7 @@
num++;
//杞崲鍥炲瓧绗︿覆骞朵繚鐣欏墠瀵奸浂
String result = String.format("%0" + currentCode.length() + "d", num);
+ //鎵撳嵃浜岀淮鐮�
//淇濆瓨鍏ュ簱娴佹按
InStoreDetail inStoreDetail = new InStoreDetail();
inStoreDetail.setInboundTime(inboundTime);
@@ -266,6 +271,7 @@
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//澧炲姞搴撳瓨鏄庣粏
ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
@@ -287,6 +293,7 @@
inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//鏌ヨ搴撳瓨鏄庣粏涓槸鍚﹀瓨鍦ㄨ宸ュ叿
ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
@@ -331,6 +338,7 @@
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -346,6 +354,7 @@
inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
@@ -378,6 +387,7 @@
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -393,6 +403,7 @@
inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
@@ -403,6 +414,7 @@
@Override
public void addApplyInStorage(JSONObject jSONObject) {
String inStorehouseType = jSONObject.getString("inStorehouseType");
+ String locationCodeId = jSONObject.getString("locationCodeId");
//鍏ュ簱鐢宠鍗昳d
String orderId = jSONObject.getString("orderId");
//鑾峰彇鍏ュ簱鏄庣粏
@@ -455,6 +467,7 @@
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//澧炲姞搴撳瓨鏄庣粏
ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
@@ -477,6 +490,7 @@
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//鏌ヨ搴撳瓨鏄庣粏涓槸鍚﹀瓨鍦ㄨ宸ュ叿
ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
@@ -527,6 +541,7 @@
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -543,6 +558,7 @@
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
//鏇存敼鏄庣粏鍏ュ簱鐘舵�佸強瀹為檯鍏ュ簱鏁伴噺
@@ -580,6 +596,7 @@
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -596,6 +613,7 @@
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
//鏇存敼鏄庣粏鍏ュ簱鐘舵�佸強瀹為檯鍏ュ簱鏁伴噺
--
Gitblit v1.9.3