From aea15a985a2b44e8294feeb0db2ac2fe762f5a81 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 26 Oct 2023 19:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=85=AC=E5=85=B1=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 17 +++++++++++++---- .../itempackaging/ItempackagingService.java | 9 +++++++++ .../itempackaging/ItempackagingServiceImpl.java | 12 ++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index f1c1acd9..70082a09 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -35,11 +35,12 @@ public interface ErrorCodeConstants { ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在"); ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "code不存在"); ErrorCode ITEMPACKAGING_ITEM_CODE_EXISTS = new ErrorCode(1_000_021_002, "code已存在"); - ErrorCode ITEMPACKAGING_UOM_NOT_EXISTS = new ErrorCode(1_000_021_003, "物品包装信息不存在"); + ErrorCode ITEMPACKAGING_UOM_NOT_EXISTS = new ErrorCode(1_000_021_003, "计量单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_UNIT_NOT_EXISTS = new ErrorCode(1_000_021_004, "包装单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_QTY_NOT_EXISTS = new ErrorCode(1_000_021_005, "包装数量不存在"); ErrorCode ITEMPACKAGING_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_021_006, "是否可用不存在"); ErrorCode ITEMPACKAGING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_021_007, "导入物品包装信息不能为空"); + ErrorCode ITEMPACKAGING_NULL = new ErrorCode(1_000_021_008, "物品包装信息无效"); //物料清单ErrorCode ErrorCode BOM_NOT_EXISTS = new ErrorCode(1_000_022_000, "物料清单不存在"); ErrorCode BOM_PRODUCT_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_022_001, "父物料代码不存在"); @@ -65,6 +66,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONLINEITEM_PRODUCT_LINE_COED_NOT_EXISTS = new ErrorCode(1_000_024_003, "产线代码不存在"); ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_024_004, "物品代码不存在"); ErrorCode PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_024_005, "是否可用不存在"); + ErrorCode PRODUCTIONLINEITEM_PRODUCTIONLINECODE_AND_ITEMCODE_NOT_EXIST = new ErrorCode(1_000_024_006, "生产线于零件关系无效"); //采购价格单ErrorCode ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_000_025_000, "供应商不存在"); ErrorCode SUPPLIER_NOT_EXISTSNO = new ErrorCode(1_000_025_001, "code已存在"); @@ -188,6 +190,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONLINE_CODE_NOT_EXISTS = new ErrorCode(1_000_039_003, "code不存在"); ErrorCode PRODUCTIONLINE_WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_000_039_004, "车间代码不存在"); ErrorCode PRODUCTIONLINE_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_039_005, "是否可用不存在"); + ErrorCode PRODUCTIONLINE_AND_WORKSHOP_RELATION_ERROR = new ErrorCode(1_000_039_004, "未查到该生产线与车间的关系"); //工序ErrorCode ErrorCode WORKSTATION_NOT_EXISTS = new ErrorCode(1_000_040_000, "工位不存在"); ErrorCode WORKSTATION_CODE_NOT_EXISTS = new ErrorCode(1_000_040_001, "code不存在"); @@ -196,6 +199,7 @@ public interface ErrorCodeConstants { ErrorCode WORKSTATION_WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_000_040_004, "车间代码不存在"); ErrorCode WORKSTATION_PRODUECTION_LINE_CODE_NOT_EXISTS = new ErrorCode(1_000_040_005, "生产线代码不存在"); ErrorCode WORKSTATION_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_040_006, "导入工序不能为空"); + ErrorCode WORKSTATION_PRODUECTION_LINE_CODE_AND_WORKSTATION_RELATION_ERROR = new ErrorCode(1_000_040_007, "生产线代码与工位不匹配"); //工序ErrorCode ErrorCode PROCESS_NOT_EXISTS = new ErrorCode(1_000_041_000, "工序不存在"); ErrorCode PROCESS_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_041_001, "导入工序数据不能为空"); @@ -220,6 +224,7 @@ public interface ErrorCodeConstants { ErrorCode CURRENCYEXCHANGE_RATE_NOT_EXISTS = new ErrorCode(1_000_044_003, "比率不存在"); ErrorCode CURRENCYEXCHANGE_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_044_004, "是否可用不存在"); ErrorCode CURRENCYEXCHANGE_CURRENCY_NOT_EXISTS = new ErrorCode(1_000_044_005, "货币不存在"); + ErrorCode TWO_CURRENCIES_HAVE_NO_CONVERSION_RELATIONSHIP = new ErrorCode(1_000_044_006, "当前两种货币没有转换关系"); //规则ErrorCode ErrorCode RULE_NOT_EXISTS = new ErrorCode(1_000_045_000, "规则不存在"); ErrorCode RULE_CODE_EXISTS = new ErrorCode(1_000_045_001, "code已存在"); @@ -403,6 +408,9 @@ public interface ErrorCodeConstants { ErrorCode PURCHASE_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_069_000, "要货计划主不存在"); //要货计划子ErrorCode ErrorCode PURCHASE_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_069_001, "要货计划子不存在"); + ErrorCode PURCHASE_PLAN_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_069_002, "要货计划明细:订单号，订单行，零件号无效"); + ErrorCode PURCHASE_PLAN_IS_CLOSED = new ErrorCode(1_000_069_003, "要货计划已经关闭"); + ErrorCode PURCHASE_PLAN_MAIN_NUMBER_INVALID = new ErrorCode(1_000_069_004, "要货计划number无效"); //供应商发货申请主ErrorCode ErrorCode SUPPLIERDELIVER_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_070_000, "供应商发货申请主不存在"); //供应商发货申请子ErrorCode @@ -426,6 +434,8 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); //采购收货记录子ErrorCode ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在"); + ErrorCode PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_074_002, "采购收货记录无效,number无效"); + ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号，订单行，零件号无效"); //采购退货申请主ErrorCode ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在"); //采购退货申请子ErrorCode @@ -797,8 +807,7 @@ public interface ErrorCodeConstants { ErrorCode TRANSACTION_NOT_EXISTS = new ErrorCode(1_000_164_000, "库存事务不存在"); //库存事务ErrorCode ErrorCode TRANSFERLOG_NOT_EXISTS = new ErrorCode(1_000_165_000, "库存转移日志不存在"); - //生产线与零件关系ErrorCode - ErrorCode PRODUCTIONLINEITEM_PITEM_NOT_EXISTS = new ErrorCode(1_000_166_000, "生产线与零件关系无效"); - + //单据开关ErrorCode + ErrorCode SWITCH_NOT_EXISTS = new ErrorCode(1_000_166_000, "单据开关不存在"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index aa5072ab..4fd0153d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -70,4 +70,13 @@ public interface ItempackagingService { List getItempackagingList(ItempackagingExportReqVO exportReqVO); List itempackagingimportDocumentList(List itempackagings, Integer mode, Boolean updatePart); + + /** + * BQ----QIP + * 查询物品标包信息 + * @author chenfang + * @param pitemCode 物品code + * @return + */ + public ItempackagingDO selectItemPackagingExist(String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index 0c16ba46..76223868 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.itempackaging; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; @@ -183,4 +184,15 @@ public class ItempackagingServiceImpl implements ItempackagingService { throw exception(ITEMPACKAGING_AVAILABLE_NOT_EXISTS); } } + @Override + public ItempackagingDO selectItemPackagingExist(String pitemCode){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("itemcode",pitemCode); + ItempackagingDO itempackagingDO = itempackagingMapper.selectOne(queryWrapper); + if(itempackagingDO != null && "TRUE".equals(itempackagingDO.getAvailable())){ + return itempackagingDO; + }else { + throw exception(ITEMPACKAGING_NULL); + } + } }