临时托盘问题

肖超群
1 parent 192bb016
Showing 6 changed files with 34 additions and 11 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -287,6 +287,9 @@ export default {
   methods: {
     getStatusColor(status) {
       const colors = {
+        '空闲': 'green',
+        '有货': 'purple',
+        '满盘': 'blue',
         '良品': 'green',
         '报废品': 'purple',
         '待确认	': 'grey',
@@ -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",
@@ -152,11 +152,11 @@ public class ContainerServiceImpl extends ServiceImpl&lt;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)) {
@@ -521,6 +521,9 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; 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("完成上架失败，没有找到目的库位");
@@ -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);
@@ -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";
+
     /**
      * 不受控
      */