From 1aa6e5963e5c4eca765924e9b2b094e6e2c525b3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 10 六月 2025 15:38:33 +0800 Subject: [PATCH] 添加出库单据任务取消功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 28 +++++--- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 48 ++++++++++++++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 14 +++- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 10 +- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 17 ++++- rsf-admin/.env | 2 rsf-server/src/main/resources/application-dev.yml | 2 7 files changed, 89 insertions(+), 32 deletions(-) diff --git a/rsf-admin/.env b/rsf-admin/.env index a0bb09f..a3c69b2 100644 --- a/rsf-admin/.env +++ b/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 diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java index 3f72e94..8a88226 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java +++ b/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; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java index 6071fb1..6e7fa3a 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java @@ -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); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java index def395e..5e2785c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java @@ -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("鍑哄簱鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�"); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index f0caa13..ae66da5 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/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 { diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java index 9584e8a..cafe93e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java +++ b/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)) { diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml index 203032b..4944870 100644 --- a/rsf-server/src/main/resources/application-dev.yml +++ b/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 -- Gitblit v1.9.1