库存锁定不能冻结和解冻

曾湘平
1 parent 80c2e14c
Showing 3 changed files with 20 additions and 4 deletions
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -447,6 +447,7 @@ export default {
         '待确认	': 'grey',
         '次品': 'red',
         '锁定': 'red',
+        '冻结': 'red',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -288,6 +288,12 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         }
         List<InventoryDetail> inventoryDetailUpdateList = new ArrayList<>();
         for (InventoryDetail inventoryDetail : inventoryDetailList) {
+            if (inventoryDetail.getContainerStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+                return Result.error("库存ID：" + inventoryDetail.getId() + "容器状态是锁定，不能冻结");
+            }
+            if (inventoryDetail.getInventoryStatus().equals(QuantityConstant.STATUS_INVENTORY_LOCK)) {
+                return Result.error("库存ID：" + inventoryDetail.getId() + "库存状态是锁定，不能冻结");
+            }
             InventoryDetail inventoryDetail1 = new InventoryDetail();
             inventoryDetail1.setId(inventoryDetail.getId());
             inventoryDetail1.setEnable(QuantityConstant.INVENTORY_DETAIL_STATUS_CONTAINER);
@@ -295,9 +301,9 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         }
         boolean success = updateBatchById(inventoryDetailUpdateList);
         if (success) {
-            return Result.ok("批量受控库存成功");
+            return Result.ok("批量冻结库存成功");
         }
-        return Result.ok("批量受控库存失败");
+        return Result.ok("批量冻结库存失败");
     }
     @Override
@@ -308,6 +314,12 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         }
         List<InventoryDetail> inventoryDetailUpdateList = new ArrayList<>();
         for (InventoryDetail inventoryDetail : inventoryDetailList) {
+            if (inventoryDetail.getContainerStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+                return Result.error("库存ID：" + inventoryDetail.getId() + "容器状态是锁定，不能释放冻结");
+            }
+            if (inventoryDetail.getInventoryStatus().equals(QuantityConstant.STATUS_INVENTORY_LOCK)) {
+                return Result.error("库存ID：" + inventoryDetail.getId() + "库存状态是锁定，不能释放冻结");
+            }
             InventoryDetail inventoryDetail1 = new InventoryDetail();
             inventoryDetail1.setId(inventoryDetail.getId());
             inventoryDetail1.setEnable(QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE);
@@ -315,9 +327,9 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         }
         boolean success = updateBatchById(inventoryDetailUpdateList);
         if (success) {
-            return Result.ok("批量释放受控库存成功");
+            return Result.ok("批量释放冻结库存成功");
         }
-        return Result.ok("批量释放受控库存失败");
+        return Result.ok("批量释放冻结库存失败");
     }
     @Override
@@ -605,6 +605,9 @@ public class QuantityConstant {
     /* 受控 */
     public static final int INVENTORY_DETAIL_STATUS_CONTAINER = 1;
+    //库存锁定
+    public static final String STATUS_INVENTORY_LOCK = "lock";
+
     public static final int HTTP_OK = 200;
     public static final String URL = "http://erptest.gani.com.cn/K3Cloud/";