From 70b87cb8f934d77d20cdb9f47348be9ab5e9ef2a Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Thu, 11 Jan 2024 15:10:39 +0800
Subject: [PATCH] 临时托盘问题
---
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue | 3 +++
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue | 15 ++++++++++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java | 4 ++--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java | 3 +++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java | 17 +++++++++++++----
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java | 3 +++
6 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
index fa5e6e7..f230b98 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
@@ -287,6 +287,9 @@ export default {
methods: {
getStatusColor(status) {
const colors = {
+ '空闲': 'green',
+ '有货': 'purple',
+ '满盘': 'blue',
'良品': 'green',
'报废品': 'purple',
'待确认 ': 'grey',
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
index 7582ac9..49ad33a 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
@@ -336,11 +336,16 @@ export default {
align: "center",
dataIndex: 'shipmentQty'
},
- {
- title: '库存总数',
- align: "center",
- dataIndex: 'inventoryQty'
- },
+ // {
+ // title: '本托盘库存数量',
+ // align: "center",
+ // dataIndex: 'containerInventoryQty'
+ // },
+ // {
+ // title: '库存总数',
+ // align: "center",
+ // dataIndex: 'inventoryQty'
+ // },
{
title: '批次',
align: "center",
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
index 896e27b..2f097df 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
@@ -152,11 +152,11 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
@Override
public Container createLSContainer(String warehouseCode) {
- String code = MessageFormat.format("{0}{1}", "LS", String.format("%d", Calendar.getInstance().getTimeInMillis()));
+ String code = MessageFormat.format("{0}{1}", QuantityConstant.CONTAINER_TYPE_LS, String.format("%d", Calendar.getInstance().getTimeInMillis()));
Container container = new Container();
container.setCode(code);
container.setWarehouseCode(warehouseCode);
- container.setContainerTypeCode("LS");
+ container.setContainerTypeCode(QuantityConstant.CONTAINER_TYPE_LS);
container.setStatus(QuantityConstant.STATUS_CONTAINER_EMPTY);
container.setFillStatus(QuantityConstant.STATUS_CONTAINER_FILL_EMPTY);
if (!save(container)) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
index 385fb7f..014850b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -521,6 +521,9 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> impl
if (container == null) {
return Result.error("完成上架失败，没有找到容器");
}
+ if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+ return Result.error("完成上架失败，容器被锁定不能用于收货" + containerCode);
+ }
Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
if (toLocation == null) {
return Result.error("完成上架失败，没有找到目的库位");
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index b9f309e..f0ebeae 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -998,7 +998,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
throw new JeecgBootException("完成平库出库，删除库存头失败");
}
String containerTypeCode = container.getContainerTypeCode();
- if (containerTypeCode.equals("LS")) {
+ if (containerTypeCode.equals(QuantityConstant.CONTAINER_TYPE_LS)) {
if (!containerService.removeById(container.getId())) {
throw new JeecgBootException("完成平库出库，删除容器失败");
}
@@ -1160,11 +1160,20 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
if (!success) {
throw new JeecgBootException("完成平库出库失败，保存库存详情失败");
}
+ Container container = containerService.getContainerByCode(containerCode, warehouseCode);
+ if (container == null) {
+ throw new JeecgBootException("完成平库出库失败，没有找到容器" + containerCode);
+ }
List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId());
if (inventoryDetailList.size() == 0) {
- success = inventoryHeaderService.removeById(inventoryHeader.getId());
- if (!success) {
- throw new JeecgBootException("完成平库出库失败，删除库存头失败");
+ if (!inventoryHeaderService.removeById(inventoryHeader.getId())) {
+ throw new JeecgBootException("完成平库出库，删除库存头失败");
+ }
+ String containerTypeCode = container.getContainerTypeCode();
+ if (containerTypeCode.equals(QuantityConstant.CONTAINER_TYPE_LS)) {
+ if (!containerService.removeById(container.getId())) {
+ throw new JeecgBootException("完成平库出库，删除容器失败");
+ }
}
}
shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
index 5c35dce..afa5faf 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -705,6 +705,9 @@ public class QuantityConstant {
public static final String WMS_DELETE_RECEIPT = "WMS删除";
public static final String WMS_COMPLETE_DELETE_RECEIPT = "单据完成删除";
+ // 临时托盘类型
+ public static final String CONTAINER_TYPE_LS = "LS";
+
/**
* 不受控
*/
--
libgit2 0.22.2