wms / wms4_shenzhenxinyi · Commits

Commit 0350c4972640ddb5771a808b595c0faf6882451a

Authored by 曾湘平
1 parent 80c2e14c

库存锁定不能冻结和解冻

Inline Side-by-side
Showing 3 changed files with 20 additions and 4 deletions
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
  View file @0350c49
... ... @@ -447,6 +447,7 @@ export default {
447 447 '待确认 ': 'grey',
448 448 '次品': 'red',
449 449 '锁定': 'red',
  450 + '冻结': 'red',
450 451 default: 'blue'
451 452 };
452 453 return colors[status] || colors.default;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
  View file @0350c49
... ... @@ -288,6 +288,12 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe
288 288 }
289 289 List<InventoryDetail> inventoryDetailUpdateList = new ArrayList<>();
290 290 for (InventoryDetail inventoryDetail : inventoryDetailList) {
  291 + if (inventoryDetail.getContainerStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
  292 + return Result.error("库存ID：" + inventoryDetail.getId() + "容器状态是锁定，不能冻结");
  293 + }
  294 + if (inventoryDetail.getInventoryStatus().equals(QuantityConstant.STATUS_INVENTORY_LOCK)) {
  295 + return Result.error("库存ID：" + inventoryDetail.getId() + "库存状态是锁定，不能冻结");
  296 + }
291 297 InventoryDetail inventoryDetail1 = new InventoryDetail();
292 298 inventoryDetail1.setId(inventoryDetail.getId());
293 299 inventoryDetail1.setEnable(QuantityConstant.INVENTORY_DETAIL_STATUS_CONTAINER);
... ... @@ -295,9 +301,9 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
295 301 }
296 302 boolean success = updateBatchById(inventoryDetailUpdateList);
297 303 if (success) {
298   - return Result.ok("批量受控库存成功");
  304 + return Result.ok("批量冻结库存成功");
299 305 }
300   - return Result.ok("批量受控库存失败");
  306 + return Result.ok("批量冻结库存失败");
301 307 }
302 308  
303 309 @Override
... ... @@ -308,6 +314,12 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
308 314 }
309 315 List<InventoryDetail> inventoryDetailUpdateList = new ArrayList<>();
310 316 for (InventoryDetail inventoryDetail : inventoryDetailList) {
  317 + if (inventoryDetail.getContainerStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
  318 + return Result.error("库存ID：" + inventoryDetail.getId() + "容器状态是锁定，不能释放冻结");
  319 + }
  320 + if (inventoryDetail.getInventoryStatus().equals(QuantityConstant.STATUS_INVENTORY_LOCK)) {
  321 + return Result.error("库存ID：" + inventoryDetail.getId() + "库存状态是锁定，不能释放冻结");
  322 + }
311 323 InventoryDetail inventoryDetail1 = new InventoryDetail();
312 324 inventoryDetail1.setId(inventoryDetail.getId());
313 325 inventoryDetail1.setEnable(QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE);
... ... @@ -315,9 +327,9 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
315 327 }
316 328 boolean success = updateBatchById(inventoryDetailUpdateList);
317 329 if (success) {
318   - return Result.ok("批量释放受控库存成功");
  330 + return Result.ok("批量释放冻结库存成功");
319 331 }
320   - return Result.ok("批量释放受控库存失败");
  332 + return Result.ok("批量释放冻结库存失败");
321 333 }
322 334  
323 335 @Override
... ...
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
  View file @0350c49
... ... @@ -605,6 +605,9 @@ public class QuantityConstant {
605 605 /* 受控 */
606 606 public static final int INVENTORY_DETAIL_STATUS_CONTAINER = 1;
607 607  
  608 + //库存锁定
  609 + public static final String STATUS_INVENTORY_LOCK = "lock";
  610 +
608 611 public static final int HTTP_OK = 200;
609 612  
610 613 public static final String URL = "http://erptest.gani.com.cn/K3Cloud/";
... ...