rsf-admin/.env
@@ -1,3 +1,3 @@ VITE_BASE_IP=192.168.4.50 VITE_BASE_IP=127.0.0.1 # VITE_BASE_IP=47.76.147.249 VITE_BASE_PORT=8080 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -223,14 +223,23 @@ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date updateTime; @TableField(exist = false) private Long waveId; // @TableField(exist = false) // private Long waveId; // // @TableField(exist = false) // private Long waveItemId; // // @TableField(exist = false) // private String waveCode; @TableField(exist = false) private Long waveItemId; private Long sourceId; @TableField(exist = false) private String waveCode; private Long source; @TableField(exist = false) private String sourceCode;
@@ -204,15 +204,21 @@ .setBatch(item.getBatch()) .setUpdateBy(loginUserId) .setCreateBy(loginUserId) .setSource(item.getId()) .setSourceId(item.getLocId()) .setSourceCode(item.getLocCode()) .setSource(item.getSource()) .setSourceId(item.getSourceId()) .setSourceCode(item.getSourceCode()) .setCreateTime(new Date()) .setUpdateTime(new Date()) .setOrderType(OrderType.ORDER_OUT.type) .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)); if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) { taskItem.setWkType(Short.parseShort(order.getWkType())); taskItem.setWkType(Short.parseShort(order.getWkType())) .setSourceCode(order.getCode()) .setSourceId(order.getId()); } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) { taskItem.setSource(item.getId()) .setSourceId(item.getLocId()) .setSourceCode(item.getLocCode()); } taskItems.add(taskItem);
@@ -450,7 +450,22 @@ if (!Objects.isNull(loc)) { List<LocItem> locItems = new ArrayList<>(); LocItem locItem = locItemService.getById(param.getId()); locItem.setOutQty(param.getOutQty()).setBatch(param.getBatch()); AsnOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>() .eq(AsnOrderItem::getAsnId, outId) .eq(StringUtils.isNotBlank(locItem.getBatch()), AsnOrderItem::getSplrBatch, locItem.getBatch()) .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), AsnOrderItem::getFieldsIndex, locItem.getFieldsIndex()) .eq(AsnOrderItem::getMatnrId, locItem.getMatnrId())); if (Objects.isNull(orderItem)) { throw new CoolException("单据明细不存在！！"); } locItem.setOutQty(param.getOutQty()) .setBatch(param.getBatch()) .setSourceId(outId) .setSourceCode(orderItem.getAsnCode()) .setSource(orderItem.getId()); locItems.add(locItem); LocToTaskParams taskParams = new LocToTaskParams(); @@ -467,15 +482,6 @@ throw new CoolException(e.getMessage()); } AsnOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>() .eq(AsnOrderItem::getAsnId, outId) .eq(StringUtils.isNotBlank(locItem.getBatch()), AsnOrderItem::getSplrBatch, locItem.getBatch()) .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), AsnOrderItem::getFieldsIndex, locItem.getFieldsIndex()) .eq(AsnOrderItem::getMatnrId, locItem.getMatnrId())); if (Objects.isNull(orderItem)) { throw new CoolException("单据明细不存在！！"); } Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 10000) / 10000.0; @@ -495,7 +501,7 @@ } Double workQty = Math.round((outOrder.getWorkQty() + sum) * 10000) / 10000.0; outOrder.setWorkQty(workQty).setExceStatus( AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val); outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val); if (!outStockService.updateById(outOrder)) { throw new CoolException("出库单状态修改失败！！"); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -79,6 +79,10 @@ private LocItemWorkingService locItemWorkingService; @Autowired private WcsService wcsService; @Autowired private OutStockService outStockService; @Autowired private OutStockItemService outStockItemService; @Override @Transactional(rollbackFor = Exception.class) @@ -519,6 +523,7 @@ /** * 任务完成后，判断深库位是否为空，如果为空生成移库任务 * * @param loginUserId * @param curLoc */ @@ -785,17 +790,48 @@ if (!taskItems.isEmpty()) { for (TaskItem item : taskItems) { if (item.getOrderType().equals(OrderType.ORDER_OUT.type)) { Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, item.getSourceId())); if (Objects.isNull(loc)) { throw new CoolException("数据错误：库位信息不存在！！"); } loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date()); if (!locService.updateById(loc)) { throw new CoolException("库位信息修改失败！！"); } //出库 if (item.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))) { //库存出库 Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, item.getSourceId())); if (Objects.isNull(loc)) { throw new CoolException("数据错误：库位信息不存在！！"); } else if (item.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type))) { //其它出库 } else { //出库单出库 AsnOrder asnOrder = outStockService.getById(item.getSourceId()); if (Objects.isNull(asnOrder)) { throw new CoolException("数据错误：单据已不存在！！"); } Double workQty = Math.round((asnOrder.getWorkQty() - item.getAnfme()) * 10000) / 10000.0; asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val) .setWorkQty(workQty.compareTo(0.00) > 0 ? workQty : 0.00 ) .setUpdateBy(loginUserId) .setUpdateTime(new Date()); if (!outStockService.updateById(asnOrder)) { throw new CoolException("原单据状态修改失败！！"); } loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date()); if (!locService.updateById(loc)) { throw new CoolException("库位信息修改失败！！"); AsnOrderItem orderItem = outStockItemService.getById(item.getSource()); if (Objects.isNull(orderItem)) { throw new CoolException("数据错误：单据明细已不存在！！"); } Double workItmQty = Math.round((orderItem.getWorkQty() - item.getAnfme()) * 10000) / 10000.0; orderItem.setWorkQty(workItmQty); if (!outStockItemService.updateById(orderItem)) { throw new CoolException("原单据明细修改失败！！"); } } } else { rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -125,9 +125,9 @@ /***将有货有的明细信息存放到库位信息中*/ for (int i = 0; i < items.size(); i++) { items.get(i) .setWaveId(param.getWaveId()) .setWaveCode(param.getWaveCode()) .setWaveItemId(param.getId()); .setSourceId(param.getWaveId()) .setSourceCode(param.getWaveCode()) .setSource(param.getId()); } locItemList.addAll(items); } @@ -141,7 +141,7 @@ listMap.keySet().forEach(key -> { List<LocItem> locItems = listMap.get(key); LocItem item1 = locItems.stream().findFirst().get(); WaveItem waveItem = waveItemService.getById(item1.getWaveItemId()); WaveItem waveItem = waveItemService.getById(item1.getSource()); if (null == waveItem || Objects.isNull(waveItem)) { throw new CoolException("数据错误：波次明细不存在！！"); } @@ -183,7 +183,7 @@ .setId(null) .setSourceCode(wave.getCode()) .setSourceId(wave.getId()) .setSource(item.getWaveItemId()); .setSource(item.getSource()); taskItems.add(taskItem); } if (!taskItemService.saveBatch(taskItems)) { rsf-server/src/main/resources/application-dev.yml
@@ -16,7 +16,7 @@ username: root url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: rsf password: 34821015 password: 1234 type: com.alibaba.druid.pool.DruidDataSource druid: initial-size: 5
