diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java index af642428..92230a4f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java @@ -219,13 +219,16 @@ public class WmsPdaApiController extends BaseController { if (wmsInventory.getInventoryQty().compareTo(outstockRecord.getOutstockQty()) < 0) { R.fail("当前库位库存为:" + wmsInventory.getInventoryQty()); } - double outSum = wmsInventory.getOutSum();//已经出库数量 + /* + double outSum = wmsInventory.getOutSum();//已经出库数量 - // BigDecimal allocateOrderQty = wmsInventory.getAllocateOrderQty();//计划数量 - // BigDecimal outstockQty = outstockRecord.getOutstockQty();//出库数量 - // if (allocateOrderQty.compareTo(outstockQty.add(BigDecimal.valueOf(outSum))) <0) { - // return R.fail("出库超量"); - // } + + BigDecimal allocateOrderQty = wmsInventory.getAllocateOrderQty();//计划数量 + BigDecimal outstockQty = outstockRecord.getOutstockQty();//出库数量 + if (allocateOrderQty.compareTo(outstockQty.add(BigDecimal.valueOf(outSum))) <0) { + return R.fail("出库超量"); + } + */ Boolean result = apiService.rawOutSubmit(outstockRecord, wmsInventory); @@ -531,7 +534,7 @@ public class WmsPdaApiController extends BaseController { private R allocateinSubmit(@RequestBody WmsAllocateTaskVo vo) { // List list = wmsAllocateTaskService.allocateSelectCode(code); // return list == null ? R.fail() : R.ok(list.get(0)); - WmsAllocateTaskBo bo=new WmsAllocateTaskBo(); + WmsAllocateTaskBo bo = new WmsAllocateTaskBo(); bo.setAllocateTaskId(vo.getAllocateTaskId()); bo.setInboundStatus("1"); bo.setUpdateTime(new Date()); diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java index 8696c6b2..6330ff65 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java @@ -391,7 +391,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { public List storeCheckSelectLocation(String type, Long storeId) { - if (type.equals("原材料盘点")) { + if (type.equals("盘点")) { return apiMapper.selectRawCheckLocationList(storeId); } else if (type.equals("半成品盘点")) { return apiMapper.selectSemiCheckLocationList(storeId); @@ -406,7 +406,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { public WmsInventoryCheck storeCheckSubmitOrder(String type, Long storeId, List list) { String tag = DateUtils.dateTime(); String tabName = null; - if (type.equals("原材料盘点")) { + if (type.equals("盘点")) { tabName = "wms_inventory_check"; } else if (type.equals("半成品盘点")) { tabName = "wms_inventory_check_2"; @@ -426,13 +426,14 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { insert.setPlanWarehouseId(storeId); insert.setCreateBy(LoginHelper.getUserId()); insert.setTenantId(LoginHelper.getTenantId()); + insert.setBeginTime(new Date()); wmsInventoryCheckMapper.insertTable(tabName, insert); return insert; } @Override public List storeCheckSelectInventory(String locationCode, String type) { - if (type.equals("原材料盘点")) { + if (type.equals("盘点")) { MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsInventory.class); lqw.eq(WmsInventory::getLocationCode, locationCode); return wmsInventoryMapper.selectVoList(lqw);