From 8f0e71fe2a55fe20ef7bfc33df267aeca05d6a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 27 Jun 2026 18:06:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E6=94=B9=E9=80=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/WmsServiceFeign.java | 2 +- .../api/factory/RemoteWmsFallbackFactory.java | 2 +- ...cutionStockOutOrderApplicationService.java | 2 +- .../ExecutionStockOutOrderDomainService.java | 8 +-- ...rvationStockInOrderApplicationService.java | 4 ++ .../ReservationStockInOrderDomainService.java | 45 +++++++++++++ ...vationStockOutOrderApplicationService.java | 3 + ...ReservationStockOutOrderDomainService.java | 44 +++++++++++++ .../ReservationStockOutOrderApi.java | 7 ++ .../ExecutionStockOutOrderApi.java | 2 +- .../ReservationStockInOrderApi.java | 7 ++ .../MaterialBaseInfoApplicationService.java | 64 ++++++++++++++++--- .../StockOutOrderApplicationService.java | 23 ++++--- .../facade/IHandoverTaskOrderService.java | 6 ++ .../mapper/HandoverTaskOrderMapper.java | 5 ++ .../persistence/HandoverTaskOrderImpl.java | 15 +++++ .../HandoverTaskOrderDomainService.java | 9 ++- .../entity/MaterialBaseInfo.java | 3 + .../mapper/MaterialBaseInfoMapper.java | 3 +- .../repository/po/MaterialBaseInfoPO.java | 3 + .../repository/todo/MaterialBaseInfoDO.java | 3 + .../facade/IStockShelfOrderService.java | 7 +- .../mapper/StockShelfOrderMapper.java | 6 ++ .../persistence/StockShelfOrderImpl.java | 15 +++++ .../service/StockShelfOrderDomainService.java | 14 +++- .../materialBaseInfo/MaterialBaseInfoDTO.java | 3 + .../OutMaterialDetailMapper.xml | 2 +- .../HandoverTaskOrderMapper.xml | 14 +++- .../InventoryStandingReportMapper.xml | 4 +- .../MaterialBaseInfoMapper.xml | 7 ++ .../MaterialInventoryMapper.xml | 24 +++---- .../OutOrderAbnormalMapper.xml | 2 +- .../pickingOrder/PickingOrderMapper.xml | 6 +- .../stockShelfOrder/StockShelfOrderMapper.xml | 23 +++++-- 34 files changed, 329 insertions(+), 58 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index a7a1f26fc..1c2afc65f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -99,7 +99,7 @@ public interface WmsServiceFeign { @ApiOperation("oms取消下发单保存") @PostMapping(value = "/stockOutOrderApi/cancelExecutionOrder") - public void cancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder); + public void omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder); @ApiOperation("oms取消下发单自动分配") @PostMapping(value = "/stockOutOrderApi/omsAutoAssign") diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java index 32c43134d..2df429128 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java @@ -74,7 +74,7 @@ public class RemoteWmsFallbackFactory implements FallbackFactory().lambda() .set(ExecutionStockOutOrder::getIssueId, null) - .set(ExecutionStockOutOrder::getIssueName, userRealName) - .set(ExecutionStockOutOrder::getIssueTime, new Date()) + .set(ExecutionStockOutOrder::getIssueName, null) + .set(ExecutionStockOutOrder::getIssueTime, null) .set(ExecutionStockOutOrder::getUpdateBy, loginUser.getUserid()) .set(ExecutionStockOutOrder::getUpdateByName, userRealName) .set(ExecutionStockOutOrder::getUpdateTime, new Date()) - .set(ExecutionStockOutOrder::getIssueStatus, 0) + .set(ExecutionStockOutOrder::getIssueStatus, 1) .in(ExecutionStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index dceb92718..a5dd3894e 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -333,6 +333,10 @@ public class ReservationStockInOrderApplicationService { return stockInOrderDomainService.issueOrder(stockInOrderDO); } + public Boolean cancelIssueOrder(ReservationStockInOrderDO stockInOrderDO){ + return stockInOrderDomainService.cancelIssueOrder(stockInOrderDO); + } + public Boolean executeAndIssue(ReservationStockInOrderDO stockInOrderDO){ return stockInOrderDomainService.executeAndIssue(stockInOrderDO); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 9c51d7a54..3f4df2b6f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -539,6 +539,51 @@ public class ReservationStockInOrderDomainService { return update; } + @Transactional(rollbackFor = Exception.class) + public Boolean cancelIssueOrder(ReservationStockInOrderDO stockInOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + boolean update = stockInOrderService.update(null, new UpdateWrapper().lambda() + .set(ReservationStockInOrder::getIssueId, null) + .set(ReservationStockInOrder::getIssueName, null) + .set(ReservationStockInOrder::getIssueTime, null) + .set(ReservationStockInOrder::getIssueStatus, 2) + .set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid()) + .set(ReservationStockInOrder::getUpdateByName, userRealName) + .set(ReservationStockInOrder::getUpdateTime, new Date()) + .in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); + + //todo下发推送到入库业务单 + List inOrderIds = stockInOrderDO.getInOrderIds(); + for (Long inOrderId : inOrderIds) { + ReservationStockInOrder byId = stockInOrderService.getById(inOrderId); + String inOrderNumber = byId.getInOrderNumber(); + List list = executionStockInOrderService.list(new QueryWrapper().lambda() + .eq(ExecutionStockInOrder::getBusinessInOrderNumber, inOrderNumber) + .eq(ExecutionStockInOrder::getDelFlag, 1)); + for (ExecutionStockInOrder executionStockInOrder : list) { + String inOrderNumber1 = executionStockInOrder.getInOrderNumber(); + List materialDetails = executionInMaterialDetailService.list(new QueryWrapper().lambda() + .eq(ExecutionInMaterialDetail::getInOrderNumber, inOrderNumber1) + .eq(ExecutionInMaterialDetail::getDelFlag, 1)); + materialDetails.forEach(materialDetail -> { + executionInMaterialDetailService.update(null, new UpdateWrapper().lambda() + .set(ExecutionInMaterialDetail::getDelFlag, 2) + .eq(ExecutionInMaterialDetail::getMaterialDetailId, materialDetail.getMaterialDetailId())); + }); + executionStockInOrderService.update(null, new UpdateWrapper().lambda() + .set(ExecutionStockInOrder::getDelFlag, 2) + .eq(ExecutionStockInOrder::getInOrderId, executionStockInOrder.getInOrderId())); + } + + } + return update; + } + @Transactional(rollbackFor = Exception.class) public Boolean executeAndIssue(ReservationStockInOrderDO stockInOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 1d1456448..92f6e15a7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -853,6 +853,9 @@ public class ReservationStockOutOrderApplicationService { public Boolean issueOrder(ReservationStockOutOrderDO stockOutOrderDO){ return stockOutOrderDomainService.issueOrder(stockOutOrderDO); } + public Boolean cancelIssueOrder(ReservationStockOutOrderDO stockOutOrderDO){ + return stockOutOrderDomainService.cancelIssueOrder(stockOutOrderDO); + } public Boolean executeAndIssue(ReservationStockOutOrderDO stockOutOrderDO){ return stockOutOrderDomainService.executeAndIssue(stockOutOrderDO); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index e2e5b4b81..d5462bcdc 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -402,6 +402,50 @@ public class ReservationStockOutOrderDomainService { return update; } + @Transactional(rollbackFor = Exception.class) + public Boolean cancelIssueOrder(ReservationStockOutOrderDO stockOutOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + boolean update = stockOutOrderService.update(null, new UpdateWrapper().lambda() + .set(ReservationStockOutOrder::getIssueId, null) + .set(ReservationStockOutOrder::getIssueName, null) + .set(ReservationStockOutOrder::getIssueTime, null) + .set(ReservationStockOutOrder::getIssueStatus, 2) + .set(ReservationStockOutOrder::getUpdateBy, loginUser.getUserid()) + .set(ReservationStockOutOrder::getUpdateByName, userRealName) + .set(ReservationStockOutOrder::getUpdateTime, new Date()) + .in(ReservationStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); + + //todo下发推送到wms + List inOrderIds = stockOutOrderDO.getOutOrderIds(); + + for (Long inOrderId : inOrderIds) { + ReservationStockOutOrder byId = stockOutOrderService.getById(inOrderId); + String inOrderNumber = byId.getOutOrderNumber(); + List list = executionStockOutOrderService.list(new QueryWrapper().lambda() + .eq(ExecutionStockOutOrder::getBusinessOutOrderNumber, inOrderNumber) + .eq(ExecutionStockOutOrder::getDelFlag, 1)); + list.forEach(executionStockOutOrder -> { + String outOrderNumber = executionStockOutOrder.getOutOrderNumber(); + List materialDetails = executionOutMaterialDetailService.list(new QueryWrapper().lambda() + .eq(ExecutionOutMaterialDetail::getOutOrderNumber, outOrderNumber) + .eq(ExecutionOutMaterialDetail::getDelFlag, 1)); + materialDetails.forEach(executionOutMaterialDetail -> { + executionOutMaterialDetailService.update(null, new UpdateWrapper().lambda() + .set(ExecutionOutMaterialDetail::getDelFlag, 2) + .eq(ExecutionOutMaterialDetail::getMaterialDetailId, executionOutMaterialDetail.getMaterialDetailId())); + }); + executionStockOutOrderService.update(null, new UpdateWrapper().lambda() + .set(ExecutionStockOutOrder::getDelFlag, 2) + .eq(ExecutionStockOutOrder::getOutOrderNumber, outOrderNumber)); + }); + } + return update; + } + @Transactional(rollbackFor = Exception.class) public Boolean executeAndIssue(ReservationStockOutOrderDO stockOutOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java index 2549b15aa..634649524 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java @@ -150,6 +150,13 @@ public class ReservationStockOutOrderApi extends BaseController { return AjaxResult.success(stockOutOrderApplicationService.issueOrder(stockOutOrderDO)); } + @ApiOperation("取消下发出库单") + @PostMapping(value = "/cancelIssueOrder") + public AjaxResult cancelIssueOrder(@RequestBody ReservationStockOutOrderDTO stockOutOrderDTO) { + ReservationStockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO); + return AjaxResult.success(stockOutOrderApplicationService.cancelIssueOrder(stockOutOrderDO)); + } + @ApiOperation("下发出库单") @PostMapping(value = "/executeAndIssue") public AjaxResult executeAndIssue(@RequestBody ReservationStockOutOrderDTO stockOutOrderDTO) { diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java index 164014156..271db670f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java @@ -155,7 +155,7 @@ public class ExecutionStockOutOrderApi extends BaseController { @PostMapping(value = "/cancelAuditState") public AjaxResult cancelAuditState(@RequestBody ExecutionStockOutOrderDTO stockOutOrderDTO) { ExecutionStockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO); - return AjaxResult.success(stockOutOrderApplicationService.auditState(stockOutOrderDO)); + return AjaxResult.success(stockOutOrderApplicationService.cancelAuditState(stockOutOrderDO)); } @ApiOperation("关闭出库单") diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java index 630db6782..ca1c77ad2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java @@ -122,6 +122,13 @@ public class ReservationStockInOrderApi extends BaseController { /** * 下发入库单 */ + @ApiOperation("取消下发入库单") + @PostMapping(value = "/cancelIssueOrder") + public AjaxResult cancelIssueOrder(@RequestBody ReservationStockInOrderDTO stockInOrderDTO) { + ReservationStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); + return AjaxResult.success(stockInOrderApplicationService.cancelIssueOrder(stockInOrderDO)); + } + @ApiOperation("下发入库单") @PostMapping(value = "/issueOrder") public AjaxResult issueOrder(@RequestBody ReservationStockInOrderDTO stockInOrderDTO) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java index e74ed185d..40a4eef6c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.enums.DictCode; @@ -54,13 +56,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -158,6 +154,8 @@ public class MaterialBaseInfoApplicationService { } } } + materialBaseInfoDO.setOrgId(String.valueOf(materialBaseInfoDO.getOrganizationId())); + materialBaseInfoDO.setOrganizationId(null); List materialBaseInfoPOS = materialBaseInfoDomainService.queryList(materialBaseInfoDO); for (MaterialBaseInfoPO materialBaseInfoPO : materialBaseInfoPOS) { //物料商品规则 @@ -557,6 +555,31 @@ public class MaterialBaseInfoApplicationService { MaterialBaseInfo matched = findExistingMaterialByShipper(row); if (matched != null) { row.setShipperId(matched.getShipperId()); + Long shipperId = matched.getShipperId(); + String customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString()); + if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) { + ObjectMapper objectMapper = new ObjectMapper(); + List> listNc = null; + try { + listNc = objectMapper.readValue( + customerCodeNcJson, + new com.fasterxml.jackson.core.type.TypeReference>>() {} + ); + String codeStr = ""; + if (listNc != null && listNc.size() > 0) { + // 方式1：Stream拼接，逗号分隔 + codeStr = listNc.stream() + .map(map -> map.get("code")) + .filter(Objects::nonNull) // 过滤code为空 + .map(Object::toString) + .collect(Collectors.joining(",")); + row.setOrgId(codeStr); + } + // codeStr 就是拼接好的字符串 + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } if (StringUtils.isBlank(row.getShipperCode())) { row.setShipperCode(matched.getShipperCode()); } @@ -798,6 +821,31 @@ public class MaterialBaseInfoApplicationService { return; } row.setShipperId(userPo.getUserId()); + Long shipperId = userPo.getUserId(); + String customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString()); + if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) { + ObjectMapper objectMapper = new ObjectMapper(); + List> listNc = null; + try { + listNc = objectMapper.readValue( + customerCodeNcJson, + new com.fasterxml.jackson.core.type.TypeReference>>() {} + ); + String codeStr = ""; + if (listNc != null && listNc.size() > 0) { + // 方式1：Stream拼接，逗号分隔 + codeStr = listNc.stream() + .map(map -> map.get("code")) + .filter(Objects::nonNull) // 过滤code为空 + .map(Object::toString) + .collect(Collectors.joining(",")); + row.setOrgId(codeStr); + } + // codeStr 就是拼接好的字符串 + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } if (!isValidOrgId(row.getOrganizationId()) && isValidOrgId(userPo.getOrganizationId())) { row.setOrganizationId(userPo.getOrganizationId()); } @@ -1266,4 +1314,4 @@ public class MaterialBaseInfoApplicationService { return tableDataInfo; } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 7008b3c42..91c190406 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -845,7 +845,10 @@ public class StockOutOrderApplicationService { public Boolean execution(String outOrderNumber){ //Boolean execution = stockOutOrderDomainService.execution(outOrderNumber); StockOutOrderDO stockOutOrderDO = new StockOutOrderDO(); - stockOutOrderDO.setOutOrderNumber(outOrderNumber); +// stockOutOrderDO.setOutOrderNumber(outOrderNumber); + List numbers = new ArrayList<>(); + numbers.add(outOrderNumber); + stockOutOrderDO.setOutOrderNumbers(numbers); Boolean b = omsAutoAssign(stockOutOrderDO); return b; } @@ -963,20 +966,20 @@ public class StockOutOrderApplicationService { List materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class); List materialDetailList2 = new ArrayList<>(); for (OutMaterialDetailDO detail : materialDetailList) { - String batchRefNo = detail.getBatchRefNo(); - String sheetRefNo = detail.getSheetRefNo(); - String boxPalletNo = detail.getBoxPalletNo(); +// String batchRefNo = detail.getBatchRefNo(); +// String sheetRefNo = detail.getSheetRefNo(); +// String boxPalletNo = detail.getBoxPalletNo(); Long materialBaseInfoId = detail.getMaterialBaseInfoId(); Long warehouseId = detail.getWarehouseId(); List materialInventories = materialInventoryMapper.selectList(new QueryWrapper().lambda() - .eq(MaterialInventory::getBatchRefNo, batchRefNo) - .eq(MaterialInventory::getSheetRefNo, sheetRefNo) - .eq(MaterialInventory::getBoxPalletNo, boxPalletNo) +// .eq(MaterialInventory::getBatchRefNo, batchRefNo) +// .eq(MaterialInventory::getSheetRefNo, sheetRefNo) +// .eq(MaterialInventory::getBoxPalletNo, boxPalletNo) .eq(MaterialInventory::getWarehouseId, warehouseId) .eq(MaterialInventory::getMaterialBaseInfoId, materialBaseInfoId)); - if (materialInventories == null || materialInventories.isEmpty()) { - throw new ServiceException("库存不存在：" + batchRefNo + " " + sheetRefNo + " " + boxPalletNo); - } +// if (materialInventories == null || materialInventories.isEmpty()) { +// throw new ServiceException("库存不存在：" + batchRefNo + " " + sheetRefNo + " " + boxPalletNo); +// } BigDecimal remainingQuantity = detail.getQuantity(); // 计划数量 for (MaterialInventory materialInventory : materialInventories) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/facade/IHandoverTaskOrderService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/facade/IHandoverTaskOrderService.java index 7e44d5aec..1909f7ae8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/facade/IHandoverTaskOrderService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/facade/IHandoverTaskOrderService.java @@ -44,4 +44,10 @@ public interface IHandoverTaskOrderService extends IService boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO); public void updateOmsOrder(String orderNumber, Integer status); + + public void updateOmsExecutionOrder(String orderNumber, Integer status); + + public Integer getExecutionRkCount(String orderNumber); + + public String getBusinessOrdernumber(String orderNumber); } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/mapper/HandoverTaskOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/mapper/HandoverTaskOrderMapper.java index 7f3ccd086..0af21184d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/mapper/HandoverTaskOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/mapper/HandoverTaskOrderMapper.java @@ -23,4 +23,9 @@ public interface HandoverTaskOrderMapper extends BaseMapper public void updateOmsOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status); + public void updateOmsExecutionOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status); + + public Integer getExecutionRkCount(@Param("orderNumber") String orderNumber); + + public String getBusinessOrdernumber(@Param("orderNumber") String orderNumber); } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java index e379d06e9..58b9e34fe 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java @@ -94,6 +94,21 @@ public class HandoverTaskOrderImpl extends ServiceImpl 0) { + if (businessOrdernumber != null) handoverTaskOrderService.updateOmsOrder(businessOrdernumber,5); + } else { + if (businessOrdernumber != null) handoverTaskOrderService.updateOmsOrder(businessOrdernumber,4); + } } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java index 6610535ca..127ea97b2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java @@ -237,4 +237,7 @@ public class MaterialBaseInfo extends BaseVOEntity { @ApiModelProperty(name = "单位") private String unit; + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/mapper/MaterialBaseInfoMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/mapper/MaterialBaseInfoMapper.java index 7a4ef0737..ea427d695 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/mapper/MaterialBaseInfoMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/mapper/MaterialBaseInfoMapper.java @@ -25,4 +25,5 @@ public interface MaterialBaseInfoMapper extends BaseMapper List selectBatchByIds(@Param("materialBaseInfoIds") List materialBaseInfoIds); -} + String getCustomerCodeNcJson(@Param("actualInvoiceCustomerId") String actualInvoiceCustomerId); +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index 19953912e..a07dbd095 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -286,4 +286,7 @@ public class MaterialBaseInfoPO extends BaseVOEntity { @ApiModelProperty(name = "单位") private String unit; + + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java index 941462c72..4f12be185 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java @@ -259,4 +259,7 @@ public class MaterialBaseInfoDO extends BaseVOEntity { @ApiModelProperty(name = "单位") private String unit; + + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/facade/IStockShelfOrderService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/facade/IStockShelfOrderService.java index 37680cb5a..94d73f025 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/facade/IStockShelfOrderService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/facade/IStockShelfOrderService.java @@ -49,9 +49,14 @@ public interface IStockShelfOrderService extends IService */ public StockShelfOrderPO getInfo(Long shelfOrderId); - public void updateOmsOrder(String orderNumber, Integer status, BigDecimal shelvesQuantity); + public Integer getExecutionCount(String orderNumber); + + public String getBusinessOrderNumber(String orderNumber); + + public void updateOmsExecutionOrder(String orderNumber, Integer status, BigDecimal shelvesQuantity); + public void updateOmsReserveOrder(String orderNumber, BigDecimal shelvesQuantity); public void updateOmsDocument(BigDecimal shelvesQuantity, BigDecimal totalNetWeight, String omsInMaterialDetail); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java index ae5c6912a..65337a867 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java @@ -24,6 +24,12 @@ public interface StockShelfOrderMapper extends BaseMapper public void updateOmsOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status, @Param("shelvesQuantity") BigDecimal shelvesQuantity); + public Integer getExecutionCount(@Param("orderNumber") String orderNumber); + + public String getBusinessOrderNumber(@Param("orderNumber") String orderNumber); + + public void updateOmsExecutionOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status, @Param("shelvesQuantity") BigDecimal shelvesQuantity); + public void updateOmsReserveOrder(@Param("orderNumber") String orderNumber, @Param("shelvesQuantity") BigDecimal shelvesQuantity); void updateOmsDocument(@Param("shelvesQuantity") BigDecimal shelvesQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("omsInMaterialDetail") String omsInMaterialDetail); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/persistence/StockShelfOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/persistence/StockShelfOrderImpl.java index 7f4e73b5a..1d15b18dd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/persistence/StockShelfOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/persistence/StockShelfOrderImpl.java @@ -115,6 +115,21 @@ public class StockShelfOrderImpl extends ServiceImpl 0) { + if (businessOrderNumber != null) stockShelfOrderService.updateOmsOrder(businessOrderNumber, 5, + shelvesQuantity == null ? null : shelvesQuantity); + } else { + if (businessOrderNumber != null) stockShelfOrderService.updateOmsOrder(businessOrderNumber, 4, + shelvesQuantity == null ? null : shelvesQuantity); + } + if (businessOrderNumber != null) stockShelfOrderService.updateOmsReserveOrder(businessOrderNumber, shelvesQuantity == null ? null : shelvesQuantity); return true; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java index 3a14c679e..94f769e21 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java @@ -311,4 +311,7 @@ public class MaterialBaseInfoDTO extends BaseVOEntity { @ApiModelProperty(name = "单位") private String unit; + + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index c614da81d..f73d0359a 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -361,7 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from out_material_detail a - left join stock_out_order b on a.out_order_number = b.out_order_number + left join stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1 and a.del_flag = 1 diff --git a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml index 4705ba9f3..b4c115f9e 100644 --- a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml @@ -151,6 +151,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update "NGWL_TEST_OMS".RESERVATION_STOCK_OUT_ORDER set ISSUE_STATUS = #{status},OUTBOUND_TIME = CURRENT_TIMESTAMP where OUT_ORDER_NUMBER = #{orderNumber} + update "NGWL_TEST_OMS".RESERVATION_STOCK_OUT_ORDER set ISSUE_STATUS = #{status},OUTBOUND_TIME = CURRENT_TIMESTAMP where OUT_ORDER_NUMBER = #{orderNumber} and DELETE_FLAG = 1 + + + update "NGWL_TEST_OMS".EXECUTION_STOCK_OUT_ORDER set ISSUE_STATUS = #{status},OUTBOUND_TIME = CURRENT_TIMESTAMP where OUT_ORDER_NUMBER = #{orderNumber} and DELETE_FLAG = 1 + + + + + \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/inventoryStandingReport/InventoryStandingReportMapper.xml b/mhd_wms/src/main/resources/mapper/inventoryStandingReport/InventoryStandingReportMapper.xml index f4b8c1ecc..d2e2ecbb8 100644 --- a/mhd_wms/src/main/resources/mapper/inventoryStandingReport/InventoryStandingReportMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inventoryStandingReport/InventoryStandingReportMapper.xml @@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM( omd.quantity ) AS material_quantity FROM out_material_detail omd - LEFT JOIN stock_out_order soo ON soo.out_order_number = omd.out_order_number + LEFT JOIN stock_out_order soo ON soo.out_order_number = omd.out_order_number and omd.del_flag = 1 and soo.del_flag = 1 WHERE soo.STATUS IN ( 7, 8 ) GROUP BY @@ -278,7 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rmd.check_quantity AS work_quantity FROM out_material_detail rmd - LEFT JOIN stock_out_order sio ON sio.out_order_number = rmd.out_order_number + LEFT JOIN stock_out_order sio ON sio.out_order_number = rmd.out_order_number and sio.del_flag = 1 and rmd.del_flag = 1 WHERE sio.STATUS IN ( 7, 8 ) diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml index b0794e3b5..6ea847f8b 100644 --- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -107,6 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.organization_id like concat('%', #{organizationId}, '%') + + and a.org_id like concat('%', #{orgId}, '%') + and a.material_base_info_id = #{materialBaseInfoId} @@ -325,5 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index eb7756062..4c7cad0c4 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -818,7 +818,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -834,7 +834,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) @@ -871,7 +871,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT MAX(c.update_time) FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -882,7 +882,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( SELECT MAX(c.update_time) FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) @@ -900,7 +900,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT MAX(c.update_time) FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -911,7 +911,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(( SELECT MAX(c.update_time) FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) @@ -1082,7 +1082,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -1102,7 +1102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -1128,7 +1128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) @@ -1152,7 +1152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) @@ -1201,7 +1201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT MAX(c.update_time) FROM picking_material_detail c LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER - left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER + left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1 WHERE c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7 AND d.warehouse_id = a.warehouse_id @@ -1212,7 +1212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(( SELECT MAX(c.update_time) FROM OUT_MATERIAL_DETAIL c - LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1 LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE d.CHECK_STATUS in (2,3) and e.STATUS = 1 and d.STATUS in (8,12) diff --git a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml index 1244b2790..0a3c003a5 100644 --- a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml +++ b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from out_order_abnormal a - left join stock_out_order b on a.out_order_number = b.out_order_number + left join stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1 diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 19ef51784..4b1d1e8c9 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,b.need_Declare_Flag from picking_order a - left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number + left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number and b.del_flag = 1 @@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from picking_order a - left join stock_out_order b on a.order_number = b.out_order_number + left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1 WHERE a.picking_order_id = #{pickingOrderId} @@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from picking_order a - left join stock_out_order b on a.order_number = b.out_order_number + left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1 WHERE a.order_number = #{orderNumber} diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index 38469fe99..ded928f2d 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -151,34 +151,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY a.create_time DESC + + - update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} + update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} and DELETE_FLAG = 1 + + + update "NGWL_TEST_OMS".EXECUTION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} and DELETE_FLAG = 1 - update "NGWL_TEST_OMS".RESERVE_STOCK_IN_ORDER set in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} + update "NGWL_TEST_OMS".RESERVE_STOCK_IN_ORDER set in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} and DELETE_FLAG = 1 - update "NGWL_TEST_OMS".RESERVATION_IN_MATERIAL_DETAIL set INBOUND_ITEMS = #{shelvesQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight},STORAGE_TIME = CURRENT_TIMESTAMP where MATERIAL_DETAIL_ID = #{omsInMaterialDetail} + update "NGWL_TEST_OMS".RESERVATION_IN_MATERIAL_DETAIL set INBOUND_ITEMS = #{shelvesQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight},STORAGE_TIME = CURRENT_TIMESTAMP where MATERIAL_DETAIL_ID = #{omsInMaterialDetail} and DELETE_FLAG = 1 update "NGWL_TEST_OMS".RESERVATION_OUT_MATERIAL_DETAIL set INBOUND_ITEMS = #{checkQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight} ,STORAGE_TIME = CURRENT_TIMESTAMP - where OUT_ORDER_NUMBER = #{outOrderNumber} and UNIQUE_ID = #{uniqueId} + where OUT_ORDER_NUMBER = #{outOrderNumber} and UNIQUE_ID = #{uniqueId} and DELETE_FLAG = 1 - update "NGWL_TEST_OMS".RESERVATION_IN_MATERIAL_DETAIL set INBOUND_ITEMS = #{shelvesQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight},STORAGE_TIME = CURRENT_TIMESTAMP + update "NGWL_TEST_OMS".RESERVATION_IN_MATERIAL_DETAIL set INBOUND_ITEMS = #{shelvesQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight},STORAGE_TIME = CURRENT_TIMESTAMP and DELETE_FLAG = 1 where LOT_NO = #{lotNumber} update "NGWL_TEST_OMS".RESERVATION_MATERIAL_INVENTORY set INVENTORY_QUANTITY = #{quantity}, ALLOCATION_QUANTITY= #{quantity} - where IN_ORDER_NUMBER = #{inOrderNumber} and LOT_NUMBER = #{lotNumber} + where IN_ORDER_NUMBER = #{inOrderNumber} and LOT_NUMBER = #{lotNumber} and DELETE_FLAG = 1 update "NGWL_TEST_OMS".RESERVATION_MATERIAL_INVENTORY set INVENTORY_QUANTITY = INVENTORY_QUANTITY - #{checkQuantity}, ALLOCATION_QUANTITY= ALLOCATION_QUANTITY - #{checkQuantity} - where IN_ORDER_NUMBER = #{inOrderNumber} and LOT_NUMBER = #{lotNo} + where IN_ORDER_NUMBER = #{inOrderNumber} and LOT_NUMBER = #{lotNo} and DELETE_FLAG = 1