From e6622bc9d989f28d3484e361fc809ffe232f67da Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 31 Oct 2023 10:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 3 -- .../service/dict/DictDataServiceImpl.java | 5 +-- .../module/wms/enums/ErrorCodeConstants.java | 17 --------- .../CurrencyexchangeService.java | 2 +- .../CurrencyexchangeServiceImpl.java | 3 +- .../CustomerreturnJobMainService.java | 2 +- .../CustomerreturnJobMainServiceImpl.java | 4 +-- .../deliverJob/DeliverJobMainService.java | 4 +-- .../deliverJob/DeliverJobMainServiceImpl.java | 4 +-- .../DeliverRecordMainServiceImpl.java | 7 ++-- .../production/ProductionMainServiceImpl.java | 13 +++---- .../ProductionlineitemServiceImpl.java | 3 +- .../service/purchase/PurchaseMainService.java | 5 +-- .../purchase/PurchaseMainServiceImpl.java | 13 +++---- .../PurchasePlanMainServiceImpl.java | 7 ++-- .../PurchasereceiptRecordMainServiceImpl.java | 5 +-- .../wms/service/sale/SaleMainServiceImpl.java | 3 +- .../SupplierdeliverRecordMainService.java | 1 + .../SupplierdeliverRecordMainServiceImpl.java | 7 ++-- .../workstation/WorkstationService.java | 4 ++- .../workstation/WorkstationServiceImpl.java | 6 ++-- .../win/module/wms/until/job/JobUtils.java | 35 +++++++++++++++---- 22 files changed, 87 insertions(+), 66 deletions(-) diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java index 445212df..2d2218ea 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java @@ -65,9 +65,6 @@ public interface ErrorCodeConstants { ErrorCode DICT_TYPE_NAME_DUPLICATE = new ErrorCode(1_002_006_003, "已经存在该名字的字典类型"); ErrorCode DICT_TYPE_TYPE_DUPLICATE = new ErrorCode(1_002_006_004, "已经存在该类型的字典类型"); ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1_002_006_005, "无法删除,该字典类型还有字典数据"); - ErrorCode DICT_TYPE_TYPE_AND_LABEL_NOT_EXISTS = new ErrorCode(1_002_006_006, "字典类型与数据参数不存在"); - ErrorCode DICT_TYPE_LABEL_NOT_EXISTS = new ErrorCode(1_002_006_007, "数据参数不存在"); - // ========== 字典数据 1-002-007-000 ========== ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1_002_007_001, "当前字典数据不存在"); ErrorCode DICT_DATA_NOT_ENABLE = new ErrorCode(1_002_007_002, "字典数据({})不处于开启状态,不允许选择"); diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java index 4826604f..843c8193 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.system.service.dict; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.enums.CommonStatusEnum; import com.win.framework.common.pojo.PageResult; @@ -199,10 +200,10 @@ public class DictDataServiceImpl implements DictDataService { if(dictDataDO != null && 0 == dictDataDO.getStatus()){ return dictDataDO; }else { - throw exception(DICT_TYPE_LABEL_NOT_EXISTS); + throw new UtilException( "字典类型" + ptype + "的数据" + plabel + "无效"); } }else { - throw exception(DICT_TYPE_TYPE_AND_LABEL_NOT_EXISTS); + throw new UtilException( "字典类型" + ptype + "无效"); } } } 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 7d285dc4..0f8dffa1 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 @@ -25,12 +25,6 @@ public interface ErrorCodeConstants { ErrorCode ITEMBASIC_VALIDITY_DAYS_NOT_EXISTS = new ErrorCode(1_000_020_013, "有效天数不存在"); ErrorCode ITEMBASIC_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_020_014, "是否可用不存在"); ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物品基础信息不能为空"); - ErrorCode ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS = new ErrorCode(1_000_020_016, "物料类型与业务类型的物料类型不一致"); - ErrorCode ITEMBASIC_STATUS_AND_BUSINESSSTATUS_NOT_EQUALS = new ErrorCode(1_000_020_017, "物料状态与业务类型的物料状态不一致"); - ErrorCode FROM_LOCATION_TYPE_AND_BUSINESSTYPE_INLOCATION_TYPE_NOT_EQUALS = new ErrorCode(1_000_020_018, "从库位类型与业务类型的从库位类型不一致"); - ErrorCode TO_LOCATION_TYPE_AND_BUSINESSTYPE_OUTLOCATION_TYPE_NOT_EQUALS = new ErrorCode(1_000_020_019, "到库位类型与业务类型的到库位类型不一致"); - ErrorCode INVENTORY_STATUS_AND_BUSINESS_IN_INVENTORY_STATUS_NOT_EQUALS_OR_NULL = new ErrorCode(1_000_020_020, "入库库存状态与业务类型的入库库存状态不一致或者为空"); - ErrorCode INVENTORY_STATUS_AND_BUSINESS_OUT_INVENTORY_STATUS_NOT_EQUALS_OR_NULL = new ErrorCode(1_000_020_020, "出库库存状态与业务类型的出库库存状态不一致或者为空"); //物品包装信息ErrorCode ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在"); ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "code不存在"); @@ -66,7 +60,6 @@ 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已存在"); @@ -224,7 +217,6 @@ 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已存在"); @@ -408,9 +400,6 @@ 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 @@ -419,8 +408,6 @@ public interface ErrorCodeConstants { ErrorCode SUPPLIERDELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_071_000, "供应商发货记录主不存在"); //供应商发货记录子ErrorCode ErrorCode SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_071_001, "供应商发货记录不存在"); - ErrorCode SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_071_002, "发货订单无效number无效"); - ErrorCode SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS = new ErrorCode(1_000_071_003, "订单号【pline_number】、订单行【pline_number】、零件号【pitem_code】无效"); //采购收货申请主ErrorCode ErrorCode PURCHASERECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_072_000, "采购收货申请主不存在"); //采购收货申请子ErrorCode @@ -434,8 +421,6 @@ 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_NUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号,单据号,订单行,零件号无效"); //采购退货申请主ErrorCode ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在"); //采购退货申请子ErrorCode @@ -663,7 +648,6 @@ public interface ErrorCodeConstants { //销售订单ErrorCode ErrorCode SALE_MAIN_NOT_EXISTS = new ErrorCode(1_000_117_000, "销售订单主不存在"); ErrorCode SALE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_117_001, "销售订单子不存在"); - ErrorCode SALE_DETAIL_NUMBER_AND_LINE_NUMBER_AND_ITEMCODE_NOT_EXISTS = new ErrorCode(1_000_117_002, "订单号【pso_numbe】、订单行【pso_line】、零件号【pitem_code】无效"); //发货计划ErrorCode ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划主不存在"); ErrorCode DELIVER_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_118_001, "发货计划子不存在"); @@ -677,7 +661,6 @@ public interface ErrorCodeConstants { //发货记录ErrorCode ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在"); ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在"); - ErrorCode DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS = new ErrorCode(1_000_121_002, "采购收货记录明细:销售订单号或销售订单行或物品代码无效"); //客户收货申请ErrorCode ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在"); ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java index d4405466..d8e02dd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java @@ -80,7 +80,7 @@ public interface CurrencyexchangeService { List importCurrencyexchangeList(List currencyexchanges, Integer mode, Boolean updatePart); /** - * BQ-------CE + * BQ----CE * 判断当前两种货币是否存在转换关系 * @author chenfang * @param pcurrency 货币 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java index 5b48f6c2..2040ca6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.currencyexchange; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; @@ -205,7 +206,7 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService { if(currencyexchangeDO != null && "TRUE".equals(currencyexchangeDO.getAvailable())){ return currencyexchangeDO; }else { - throw exception(TWO_CURRENCIES_HAVE_NO_CONVERSION_RELATIONSHIP); + throw new UtilException( "货币" + pcurrency + "与基础货币" + pbasiccurrency + "无效"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index 7b91699e..6586c739 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -89,7 +89,7 @@ public interface CustomerreturnJobMainService { * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); /** * 校验销售订单明细 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index ca01a90f..8ee9c761 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -97,8 +97,8 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe } //校验采购订单明细 @Override - public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber) { - PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, ppoNumber,poLine); return purchaseDetailDO; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 69364498..adf1632e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -90,10 +90,10 @@ public interface DeliverJobMainService { * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); /** * Order----VS - * 校验采销售订单明细 + * 校验销售订单明细 * @author chenfang * @param psoNumber 单据号 * @param pitemCode 物品代码 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 8ef700ad..0c26bc1c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -99,8 +99,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { } //校验采购订单明细 @Override - public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode,String psupplierCode,String plineNumber) { - PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, ppoNumber,poLine); return purchaseDetailDO; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index 1c4d876e..c9454194 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.deliverRecord; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReqVO; @@ -89,10 +90,12 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { if(deliverRecordDetailDO != null && "TRUE".equals(deliverRecordDetailDO.getAvailable())){ return deliverRecordDetailDO; }else { - throw exception(DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS); + throw new UtilException( "采购收货记录明细:销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); } + }else { + throw new UtilException( "发货订单无效" + pnumber + "无效"); + } - return null; } @Override public List getDeliverRecordMainList(Collection ids) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index dd566464..ea4b06dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.production; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; @@ -106,14 +107,14 @@ public class ProductionMainServiceImpl implements ProductionMainService { ProductionDetailDO productionDetailDO = productionDetailMapper.selectOne(queryWrapper1); if (productionDetailDO != null && "TRUE".equals(productionDetailDO.getAvailable())) { return productionDetailDO; - } else { - throw exception(PRODUCTION_MAIN_MASSAGE_EXISTS); + }else { + throw new UtilException( "生产计划明细:订单号" + pnumber + "、零件号" + pitemCode + "、无效"); } - } else{ - throw exception(PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS); + }else { + throw new UtilException( "生产计划" + pnumber + "已经关闭"); } - } else { - throw exception(PRODUCTION_MAIN_NUMBER_NOT_EXISTS); + }else { + throw new UtilException( "生产计划" + pnumber + "无效"); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index b81ee9ec..05b7f925 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.productionlineitem; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; @@ -179,7 +180,7 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } } }else { - throw exception(PRODUCTIONLINEITEM_PRODUCTIONLINECODE_AND_ITEMCODE_NOT_EXIST); + throw new UtilException( "生产线" + pproductionLineCode + "与零件" + pitemCode + "关系无效"); } return productionlineitemDO; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index 6e450520..b56fd1cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -81,14 +81,15 @@ public interface PurchaseMainService { */ List getPurchaseMainList(PurchaseMainExportReqVO exportReqVO); /** + * Order----VPur * 校验采购订单明细 - * + * @author chenfang * @param pnumber 单据号 * @param psupplierCode 供应商代码 * @param pitemCode 物品代码 * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber); + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 226350b6..2b325453 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchase; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; @@ -93,7 +94,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { } //公共方法 校验采购订单明细 @Override - public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber) { + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); queryWrapper.eq("supplier_code",psupplierCode); @@ -103,19 +104,19 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("master_id",purchaseMainDO.getId()); queryWrapper1.eq("number",pnumber); - queryWrapper1.eq("item_code",pitemCode); - queryWrapper1.eq("line_number",plineNumber); + queryWrapper1.eq("po_line",poLine); + queryWrapper1.eq("po_number",ppoNumber); PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); if(purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())){ return purchaseDetailDO; }else { - throw exception(PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS); + throw new UtilException( "采购订单明细:订单号" + ppoNumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效"); } }else { - throw exception(PURCHASE_DETAIL_NUMBER_NOT_EXISTS); + throw new UtilException( "采购订单" + pnumber + "已经关闭"); } }else { - throw exception(PURCHASE_DETAIL_NOT_EXISTS); + throw new UtilException( "采购订单" + pnumber + "无效"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index 2d4ce280..feefe5d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasePlan; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainCreateReqVO; @@ -110,13 +111,13 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { if(purchasePlanDetailDO != null && "TRUE".equals(purchasePlanDetailDO.getAvailable())){ return purchasePlanDetailDO; }else { - throw exception(PURCHASE_PLAN_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID); + throw new UtilException( "要货计划明细:订单号" + ppoNumber + "、订单行" + ppoLine + "、零件号" + pitemCode + "、无效"); } }else { - throw exception(PURCHASE_PLAN_IS_CLOSED); + throw new UtilException( "要货计划" + pnubmer + "已经关闭"); } }else { - throw exception(PURCHASE_PLAN_MAIN_NUMBER_INVALID); + throw new UtilException( "要货计划" + pnubmer + "无效"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 9dda87b2..ee866640 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRecord; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; @@ -107,10 +108,10 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco if(purchasereceiptRecordDetailDO != null){ return purchasereceiptRecordDetailDO; }else { - throw exception(PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_NUMBER_POLINE_ITEMCODE_INVALID); + throw new UtilException( "采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); } }else { - throw exception(PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS); + throw new UtilException( "采购收货记录无效" + pNumber + "无效"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index 193d3a68..eed1063e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.sale; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; @@ -106,7 +107,7 @@ public class SaleMainServiceImpl implements SaleMainService { if(saleDetailDO != null){ return saleDetailDO; }else { - throw exception(SALE_DETAIL_NUMBER_AND_LINE_NUMBER_AND_ITEMCODE_NOT_EXISTS); + throw new UtilException( "销售订单明细:订单号" + psoNumber + "、订单行" + psoLine + "、零件号" + pitemCode + "无效"); } }else { throw exception(SALE_MAIN_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index 43270b01..b8914435 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -81,6 +81,7 @@ public interface SupplierdeliverRecordMainService { List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO); /** + * Record----VSD * 校验供应商发货记录 * @author chenfang * @param pasnNumber 发货单号 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index b733d7ee..89115b8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierdeliverRecord; +import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; @@ -106,10 +107,12 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco if(supplierdeliverRecordDetailDO != null){ return supplierdeliverRecordDetailDO; }else { - throw exception(SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS); + throw new UtilException( "供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); + } }else { - throw exception(SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS); + throw new UtilException( "发货订单无效" + pasnNumber + "无效"); + } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java index 8e0d6ac9..ac7ac1df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java @@ -85,9 +85,11 @@ public interface WorkstationService { * BQ-----QWStation * 查询工位是否存在 * @param pcode 工位code + * @param pworkshopCode 车间code + * @param pproductionLineCode 生产线code * @return */ - public WorkstationDO selectWorkstationExist(String pcode); + public WorkstationDO selectWorkstationExist(String pcode,String pworkshopCode,String pproductionLineCode); /** * 校验工位与生产线关系是否存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java index 00fcd30b..85effb0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java @@ -213,14 +213,16 @@ public class WorkstationServiceImpl implements WorkstationService { } @Override - public WorkstationDO selectWorkstationExist(String pcode){ + public WorkstationDO selectWorkstationExist(String pcode,String pworkshopCode,String pproductionLineCode){ QueryWrapper queryWrapperWorkstation = new QueryWrapper(); queryWrapperWorkstation.eq("code",pcode); + queryWrapperWorkstation.eq("workshop_code",pworkshopCode); + queryWrapperWorkstation.eq("production_line_code",pproductionLineCode); WorkstationDO workstationDO = workstationMapper.selectOne(queryWrapperWorkstation); if(workstationDO != null && "TRUE".equals(workstationDO.getAvailable())){ return workstationDO; }else { - throw exception(WORKSTATION_NOT_EXISTS); + throw new UtilException( "车间" + pworkshopCode + "生产线" + pproductionLineCode + "工位" + pcode + "无效"); } } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java index 5cdf4e4b..8d1f1f73 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java @@ -281,7 +281,9 @@ public class JobUtils { if (ifInType == true) { return true; } else { - throw exception(ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS); + throw new UtilException("物料类型" + pitemCode + "的类型" + itembasicDO.getType() + " 与业务类型" + businesstypeDO.getName() + + "的物料类型" + businesstypeDO.getItemTypes() +"不一致"); + } } @@ -297,7 +299,7 @@ public class JobUtils { if (ifInType == true) { return true; } else { - throw exception(ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS); + throw new UtilException("物料类型" + pitemType + " 与业务类型" + businesstypeDO.getName() + "的物料类型" + businesstypeDO.getItemTypes() +"不一致"); } } //DBT---DBT2---IS 物料状态检验是否一致 @@ -311,11 +313,14 @@ public class JobUtils { ifInStatus = true; } } + }else { + throw new UtilException("物料代码" + pitemCode + "无效"); } if (ifInStatus == true) { return true; } else { - throw exception(ITEMBASIC_STATUS_AND_BUSINESSSTATUS_NOT_EQUALS); + throw new UtilException("物料" + pitemCode + "的状态" + itembasicDO.getStatus() + "与业务类型" + + businesstypeDO.getName() + "的物料状态" + businesstypeDO.getItemStatuses() + "不一致"); } } @@ -331,10 +336,14 @@ public class JobUtils { } } } + else { + throw new UtilException("库位" + plocationCode + "无效"); + } if (ifInLocationType == true) { return true; } else { - throw exception(FROM_LOCATION_TYPE_AND_BUSINESSTYPE_INLOCATION_TYPE_NOT_EQUALS); + throw new UtilException("入库库位" + plocationCode + "的库位类型" + locationDO.getType() + "与业务类型" + + businesstypeDO.getName() + "的入库库位类型" + businesstypeDO.getInLocationTypes() + "不一致"); } } @@ -350,10 +359,14 @@ public class JobUtils { } } } + else { + throw new UtilException("库位" + plocationCode + "无效"); + } if (ifOutLocationType == true) { return true; } else { - throw exception(TO_LOCATION_TYPE_AND_BUSINESSTYPE_OUTLOCATION_TYPE_NOT_EQUALS); + throw new UtilException("出库库位" + plocationCode + "的库位类型" + locationDO.getType() + "与业务类型" + + businesstypeDO.getName() + "的出库库位类型" + businesstypeDO.getOutLocationTypes() + "不一致"); } } @@ -368,10 +381,14 @@ public class JobUtils { } } } + else { + throw new UtilException("入库库存状态" + pinventoryStatus + "为空"); + } if (ifInInventoryStatuses == true) { return true; } else { - throw exception(INVENTORY_STATUS_AND_BUSINESS_IN_INVENTORY_STATUS_NOT_EQUALS_OR_NULL); + throw new UtilException("入库库存状态" + pinventoryStatus + "与业务类型" + + businesstypeDO.getName() + "的入库库存状态" + businesstypeDO.getInInventoryStatuses() + "不一致"); } } @@ -386,10 +403,14 @@ public class JobUtils { } } } + else { + throw new UtilException("出库库存状态" + pinventoryStatus + "为空"); + } if (ifOutInventoryStatuses == true) { return true; } else { - throw exception(INVENTORY_STATUS_AND_BUSINESS_OUT_INVENTORY_STATUS_NOT_EQUALS_OR_NULL); + throw new UtilException("出库库存状态" + pinventoryStatus + "与业务类型" + + businesstypeDO.getName() + "的出库库存状态" + businesstypeDO.getOutInventoryStatuses() + "不一致"); } }