From e0529614c187a5457ca3f587a16edeec51d69d15 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:16 +0800
Subject: [PATCH] 刀具寿命
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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..ea6a3a7 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,12 +271,14 @@
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//澧炲姞搴撳瓨鏄庣粏
ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
toolLedgerDetail.setToolCode(inboundDetailVo.getToolCodeId());
toolLedgerDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.save(toolLedgerDetail);
//鏇存柊褰撳墠缂栫爜
@@ -287,6 +294,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();
@@ -321,6 +329,7 @@
.eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId())
.eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.updateById(toolLedgerDetail);
//淇濆瓨鍏ュ簱娴佹按
@@ -331,6 +340,7 @@
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -346,6 +356,7 @@
inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
@@ -368,6 +379,7 @@
.eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId())
.eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.updateById(toolLedgerDetail);
//淇濆瓨鍏ュ簱娴佹按
@@ -378,6 +390,7 @@
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -393,6 +406,7 @@
inStoreDetail.setInNumber(inboundDetailVo.getInStorageQuantity());
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
@@ -403,6 +417,7 @@
@Override
public void addApplyInStorage(JSONObject jSONObject) {
String inStorehouseType = jSONObject.getString("inStorehouseType");
+ String locationCodeId = jSONObject.getString("locationCodeId");
//鍏ュ簱鐢宠鍗昳d
String orderId = jSONObject.getString("orderId");
//鑾峰彇鍏ュ簱鏄庣粏
@@ -455,12 +470,14 @@
inStoreDetail.setInStorehouseType("1");
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//澧炲姞搴撳瓨鏄庣粏
ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
toolLedgerDetail.setToolCode(inboundDetailVo.getToolCodeId());
toolLedgerDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.save(toolLedgerDetail);
//鏇存柊褰撳墠缂栫爜
@@ -477,6 +494,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();
@@ -516,6 +534,7 @@
.eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId())
.eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.updateById(toolLedgerDetail);
//淇濆瓨鍏ュ簱娴佹按
@@ -527,6 +546,7 @@
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -543,6 +563,7 @@
inStoreDetail.setInStorehouseType("2");
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
//鏇存敼鏄庣粏鍏ュ簱鐘舵�佸強瀹為檯鍏ュ簱鏁伴噺
@@ -569,6 +590,7 @@
.eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId())
.eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
toolLedgerDetail.setQuantity(BigDecimal.ONE);
+ toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
toolLedgerDetail.setStatus("1");
toolLedgerDetailService.updateById(toolLedgerDetail);
//淇濆瓨鍏ュ簱娴佹按
@@ -580,6 +602,7 @@
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
inStoreDetail.setToolId(inboundDetailVo.getOnlyCode());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
//涓嶇鍒版妸
}else {
@@ -596,6 +619,7 @@
inStoreDetail.setInStorehouseType("5");
inStoreDetail.setInStorehouseId(orderId);
inStoreDetail.setToolCode(inboundDetailVo.getToolCodeId());
+ inStoreDetail.setGoodsShelvesId(locationCodeId);
inStoreDetailService.save(inStoreDetail);
}
//鏇存敼鏄庣粏鍏ュ簱鐘舵�佸強瀹為檯鍏ュ簱鏁伴噺
--
Gitblit v1.9.3