From ed9ba1fefc973fc7ba913dcf37d8a60a33ca7fe6 Mon Sep 17 00:00:00 2001 From: Ledo Date: Mon, 17 Feb 2025 16:40:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=91=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E4=BC=9A=E6=9F=A5=E8=AF=A2=E5=88=B0?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E4=B8=BA=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/heli/enums/ErrorCodeConstants.java | 2 +- .../mysql/pgmaster/PgMasterLineMapper.java | 1 - .../mysql/storagemat/StorageMatMapper.java | 2 ++ .../deliverorder/DeliverOrderServiceImpl.java | 1 - .../storagemat/StorageMatServiceImpl.java | 31 +++++++++++-------- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java index 768078f..8ae00de 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -63,7 +63,7 @@ public interface ErrorCodeConstants { ErrorCode STORAGE_LOG_NOT_EXISTS = new ErrorCode(1_003_006, "库存日志不存在"); ErrorCode STORAGE_CHECK_NOT_EXISTS = new ErrorCode(1_003_007, "库存盘点不存在"); ErrorCode STORAGE_CHECK_MAT_NOT_EXISTS = new ErrorCode(1_003_008, "盘点物料不存在"); - + ErrorCode BEFORE_STORAGE_NOT_EXISTS = new ErrorCode(1_003_009, "物料原仓库查询错误"); /************订单管理***********/ ErrorCode PROJECT_ORDER_NOT_EXISTS = new ErrorCode(1_004_001, "项目订单不存在"); /************发货管理***********/ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java index 7583c39..1eb3eba 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java @@ -87,7 +87,6 @@ public interface PgMasterLineMapper extends BaseMapperX { query.orderByDesc(PgMasterLineDO::getPgNumber); }else{ query.orderByAsc(PgMasterLineDO::getPgNumber); - // query.orderByDesc(PlanDO::getId); } query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) .eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java index 586ce2f..4a9c380 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagemat/StorageMatMapper.java @@ -74,6 +74,7 @@ public interface StorageMatMapper extends BaseMapperX { .disableSubLogicDel() .eq(StorageMatDO::getProjectNo,subId) .eq(StorageMatDO::getMatId,materialId) + .eq(StorageDO::getStatus,2) .eq(StorageDO::getStockType,"1") .eq(StorageDO::getStockInType,"1") ; @@ -92,6 +93,7 @@ public interface StorageMatMapper extends BaseMapperX { .disableSubLogicDel() .eq(StorageMatDO::getProjectNo,subId) .eq(StorageMatDO::getMatId,materialId) + .eq(StorageDO::getStatus,2) .eq(StorageDO::getStockType,"2") .eq(StorageDO::getStockInType,"5") ; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java index e248bea..50af5ab 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java @@ -270,7 +270,6 @@ public class DeliverOrderServiceImpl implements DeliverOrderService { //子订单号 Long subId = o.getSaleOrderSubId(); - System.out.println("子项目ID"+subId); //查询此订单已发货总数量 DeliverOrderSubDO deliverOrderSubDO = deliverOrderSubMapper.searchNum(subId); //再获取订单中的生产数量 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java index 70d178a..30bd9cd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java @@ -155,20 +155,25 @@ public class StorageMatServiceImpl implements StorageMatService { //上面是入库，下面是要从原仓出库 //减原仓 for (StorageMatFBSaveReqVO storageMatFBSaveReqVO : createReqVO) { - String[] split = storageMatFBSaveReqVO.getWareHouseId().split("-"); - if (split.length == 3) { - storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); - storageMatFBSaveReqVO.setRgId(Long.valueOf(split[1])); - storageMatFBSaveReqVO.setPnId(Long.valueOf(split[2])); - } else if (split.length == 2) { - storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); - storageMatFBSaveReqVO.setRgId(Long.valueOf(split[1])); - storageMatFBSaveReqVO.setPnId(null); - } else { - storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); - storageMatFBSaveReqVO.setRgId(null); - storageMatFBSaveReqVO.setPnId(null); + if (storageMatFBSaveReqVO.getWareHouseId()!=null){ + String[] split = storageMatFBSaveReqVO.getWareHouseId().split("-"); + if (split.length == 3) { + storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); + storageMatFBSaveReqVO.setRgId(Long.valueOf(split[1])); + storageMatFBSaveReqVO.setPnId(Long.valueOf(split[2])); + } else if (split.length == 2) { + storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); + storageMatFBSaveReqVO.setRgId(Long.valueOf(split[1])); + storageMatFBSaveReqVO.setPnId(null); + } else { + storageMatFBSaveReqVO.setWhId(Long.valueOf(split[0])); + storageMatFBSaveReqVO.setRgId(null); + storageMatFBSaveReqVO.setPnId(null); + } + }else { + throw exception(BEFORE_STORAGE_NOT_EXISTS); } + } Map> outListByWhid = createReqVO.stream() .collect(Collectors.groupingBy(StorageMatFBSaveReqVO::getWhId));