diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java index 09f24836..25fe44b6 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java @@ -47,5 +47,5 @@ public interface DictDataApi { */ String[] getDictDataByType(String type); - + DictDataRespDTO selectDictTypeAndLabel(String ptype, String plabel); } 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 ee19713d..445212df 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,6 +65,8 @@ 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, "当前字典数据不存在"); diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java index 22c3c0b4..758b5761 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java @@ -50,5 +50,9 @@ public class DictDataApiImpl implements DictDataApi { } return result; } - + @Override + public DictDataRespDTO selectDictTypeAndLabel(String ptype, String plabel) { + DictDataDO dictDataDO = dictDataService.selectDictTypeAndLabel(ptype, plabel); + return DictDataConvert.INSTANCE.convert02(dictDataDO); + } } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java index 8b243f82..2cb0eb66 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java @@ -105,4 +105,6 @@ public interface DictDataService { * @return 字典数据 */ DictDataDO parseDictData(String dictType, String label); + + DictDataDO selectDictTypeAndLabel(String ptype, String plabel); } 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 61289c3c..4826604f 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.enums.CommonStatusEnum; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.collection.CollectionUtils; @@ -13,6 +14,7 @@ import com.win.module.system.dal.dataobject.dict.DictDataDO; import com.win.module.system.dal.dataobject.dict.DictTypeDO; import com.win.module.system.dal.mysql.dict.DictDataMapper; import com.google.common.annotations.VisibleForTesting; +import com.win.module.system.dal.mysql.dict.DictTypeMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -34,6 +36,9 @@ import static com.win.module.system.enums.ErrorCodeConstants.*; @Slf4j public class DictDataServiceImpl implements DictDataService { + @Resource + private DictTypeMapper dictTypeMapper; + /** * 排序 dictType > sort */ @@ -180,5 +185,24 @@ public class DictDataServiceImpl implements DictDataService { public DictDataDO parseDictData(String dictType, String label) { return dictDataMapper.selectByDictTypeAndLabel(dictType, label); } - + //调用公共方法 查询字典项 + @Override + public DictDataDO selectDictTypeAndLabel(String ptype,String plabel) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("type",ptype); + DictTypeDO dictTypeDO = dictTypeMapper.selectOne(queryWrapper); + if(dictTypeDO != null && 0 == dictTypeDO.getStatus()){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("dict_type",ptype); + queryWrapper1.eq("label",plabel); + DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); + if(dictDataDO != null && 0 == dictDataDO.getStatus()){ + return dictDataDO; + }else { + throw exception(DICT_TYPE_LABEL_NOT_EXISTS); + } + }else { + throw exception(DICT_TYPE_TYPE_AND_LABEL_NOT_EXISTS); + } + } } 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 59bb4fdb..9d73bbaf 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 @@ -130,7 +130,7 @@ public interface ErrorCodeConstants { ErrorCode WAREHOUSE_AVAIABLE_NOT_EXISTS = new ErrorCode(1_033_000_003, "是否可用不存在"); ErrorCode WAREHOUSE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_033_000_004, "导入仓库不能为空"); //月台ErrorCode - ErrorCode DOCK_NOT_EXISTS = new ErrorCode(1_000_034_000, "月台不存在"); + ErrorCode DOCK_NOT_EXISTS = new ErrorCode(1_000_034_000, "月台(收货口)不存在"); ErrorCode DOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_034_001, "code不存在"); ErrorCode DOCK_CODE_EXISTS = new ErrorCode(1_000_034_002, "code已存在"); ErrorCode DOCK_TYPE_NOT_EXISTS = new ErrorCode(1_000_034_003, "类型不存在"); @@ -167,6 +167,7 @@ public interface ErrorCodeConstants { ErrorCode LOCATION_USER_GROUP_CODE_NOT_EXISTS = new ErrorCode(1_000_037_009, "用户组代码不存在"); ErrorCode LOCATION_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_037_010, "是否可用不存在"); ErrorCode LOCATION_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_037_011, "导入库位不能为空"); + ErrorCode LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS = new ErrorCode(1_000_037_011, "未查找到零件item_code库位location_code对应的上架策略"); //车间ErrorCode ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_038_000_000, "车间不存在"); ErrorCode WORKSHOP_CODE_EXISTS = new ErrorCode(1_039_000_001, "code已存在"); @@ -364,8 +365,9 @@ public interface ErrorCodeConstants { ErrorCode PURCHASE_CLOSED_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单已关闭"); //采购订单子ErrorCode ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在"); + ErrorCode PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS = new ErrorCode(1_000_063_002, "采购订单明细：订单号ppo_number、订单行pline_number、零件号pitem_code无效"); + ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单pnumber无效"); //采购订单ErrorCode - ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单明细订单号不存在"); //采购索赔申请主ErrorCode ErrorCode PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_064_000, "采购索赔申请主不存在"); //采购索赔申请主ErrorCode @@ -399,7 +401,9 @@ public interface ErrorCodeConstants { //供应商发货记录主ErrorCode 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_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 @@ -408,6 +412,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_073_000, "采购收货任务主不存在"); //采购收货任务子ErrorCode ErrorCode PURCHASERECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_073_001, "采购收货任务子不存在"); + ErrorCode PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_073_002, "采购收货任务状态错误"); //采购收货记录主ErrorCode ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); //采购收货记录子ErrorCode @@ -420,6 +425,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_076_000, "采购退货任务主不存在"); //采购退货任务子ErrorCode ErrorCode PURCHASERETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_076_001, "采购退货任务子不存在"); + ErrorCode PURCHASERETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_076_002, "采购退货任务状态"); //采购退货记录主ErrorCode ErrorCode PURCHASERETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_077_000, "采购退货记录主不存在"); //采购退货记录子ErrorCode @@ -432,6 +438,7 @@ public interface ErrorCodeConstants { ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); //检验任务子ErrorCode ErrorCode INSPECT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_079_001, "检验任务子不存在"); + ErrorCode INSPECT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_079_002, "检验任务状态错误"); //检验记录主ErrorCode ErrorCode INSPECT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_080_000, "检验记录主不存在"); //检验记录子ErrorCode @@ -464,6 +471,7 @@ public interface ErrorCodeConstants { //补料任务子ErrorCode ErrorCode REPLEINSH_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_087_001, "补料任务子不存在"); + ErrorCode REPLEINSH_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_087_002, "补料任务状态错误"); //补料记录主ErrorCode ErrorCode REPLEINSH_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_088_000, "补料记录主不存在"); @@ -482,6 +490,7 @@ public interface ErrorCodeConstants { //拣料任务子ErrorCode ErrorCode PICK_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_088_001, "拣料任务子不存在"); + ErrorCode PICK_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_088_002, "拣料任务状态错误"); //拣料记录主ErrorCode ErrorCode PICK_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_089_000, "拣料记录主不存在"); @@ -500,6 +509,7 @@ public interface ErrorCodeConstants { //发料任务子ErrorCode ErrorCode ISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_091_001, "发料任务子不存在"); + ErrorCode ISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_091_002, "发料任务状态错误"); //发料记录主ErrorCode ErrorCode ISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_092_000, "发料记录主不存在"); @@ -511,6 +521,7 @@ public interface ErrorCodeConstants { //生产收料任务子ErrorCode ErrorCode PRODUCTIONRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_093_001, "生产收料任务子不存在"); + ErrorCode PRODUCTIONRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_093_002, "生产收料任务状态错误"); //生产收料记录主ErrorCode ErrorCode PRODUCTIONRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_094_000, "生产收料记录主不存在"); @@ -533,6 +544,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_098_000, "生产退料任务主不存在"); //生产退料任务子ErrorCode ErrorCode PRODUCTIONRETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_098_001, "生产退料任务子不存在"); + ErrorCode PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_098_002, "生产退料任务状态错误"); //生产退料记录主ErrorCode ErrorCode PRODUCTIONRETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_099_000, "生产退料记录主不存在"); //生产退料任务子ErrorCode @@ -545,7 +557,10 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTION_MAIN_NOT_EXISTS = new ErrorCode(1_001_101_000, "生产计划主不存在"); //生产计划子ErrorCode - ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_100_001, "生产计划子不存在"); + ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_101_001, "生产计划子不存在"); + ErrorCode PRODUCTION_MAIN_MASSAGE_EXISTS = new ErrorCode(1_001_101_002, "生产计明细:订单号pline_number、零件号pitem_code无效"); + ErrorCode PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS = new ErrorCode(1_001_101_003, "生产计划number已经关闭"); + ErrorCode PRODUCTION_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_001_101_004, "生产计划number无效"); //制品收货申请主ErrorCode ErrorCode PRODUCTRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_102_000, "制品收货申请主不存在"); @@ -555,6 +570,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_103_000, "制品收货任务主不存在"); //制品收货申请子ErrorCode ErrorCode PRODUCTRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_103_001, "制品收货任务子不存在"); + ErrorCode PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_103_002, "制品收货任务状态错误"); //制品收货记录主ErrorCode ErrorCode PRODUCTRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_104_000, "制品收货记录主不存在"); //制品收货记录子ErrorCode @@ -572,6 +588,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTDISMANTLE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_106_000, "制品拆解任务主不存在"); //制品拆解任务子ErrorCode ErrorCode PRODUCTDISMANTLE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_106_001, "制品拆解任务子不存在"); + ErrorCode PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_106_002, "制品拆解任务状态错误"); //制品拆解记录主ErrorCode ErrorCode PRODUCTDISMANTLE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_107_000, "制品拆解记录主不存在"); @@ -603,6 +620,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTSCRAP_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_111_000, "制品报废任务主不存在"); //制品报废任务子ErrorCode ErrorCode PRODUCTSCRAP_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_110_001, "制品报废任务子不存在"); + ErrorCode PRODUCTSCRAP_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_111_002, "制品报废任务状态错误"); //制品报废记录ErrorCode ErrorCode PRODUCTSCRAP_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_111_000, "制品报废记录主不存在"); ErrorCode PRODUCTSCRAP_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_111_001, "制品报废记录子不存在"); @@ -612,6 +630,7 @@ public interface ErrorCodeConstants { //制品上架任务ErrorCode ErrorCode PRODUCTPUTAWAY_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_113_000, "制品上架任务主不存在"); ErrorCode PRODUCTPUTAWAY_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_113_001, "制品上架任务子不存在"); + ErrorCode PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_113_002, "制品上架任务状态错误"); //制品上架任务ErrorCode ErrorCode PRODUCTPUTAWAY_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_114_000, "制品上架记录主不存在"); ErrorCode PRODUCTPUTAWAY_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_114_001, "制品上架记录子不存在"); @@ -624,6 +643,7 @@ 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, "发货计划子不存在"); @@ -633,6 +653,7 @@ public interface ErrorCodeConstants { //发货任务ErrorCode ErrorCode DELIVER_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_120_000, "发货任务主不存在"); ErrorCode DELIVER_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_120_001, "发货任务子不存在"); + ErrorCode DELIVER_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_120_003, "发货任务状态错误"); //发货记录ErrorCode ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "发货记录主不存在"); ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "发货记录子不存在"); @@ -648,6 +669,7 @@ public interface ErrorCodeConstants { //客户退货任务ErrorCode ErrorCode CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_125_000, "客户退货任务主不存在"); ErrorCode CUSTOMERRETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_125_001, "客户退货任务子不存在"); + ErrorCode CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_125_003, "客户退货任务状态错误"); //客户退货记录ErrorCode ErrorCode CUSTOMERRETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_126_000, "客户退货记录主不存在"); ErrorCode CUSTOMERRETURN_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_126_001, "客户退货记录子不存在"); @@ -669,6 +691,7 @@ public interface ErrorCodeConstants { //库存转移任务ErrorCode ErrorCode INVENTORYMOVE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_132_000, "库存转移任务主不存在"); ErrorCode INVENTORYMOVE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_132_001, "库存转移任务子不存在"); + ErrorCode INVENTORYMOVE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_132_000, "库存转移任务状态错误"); //库存转移记录ErrorCode ErrorCode INVENTORYMOVE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_133_000, "库存转移记录主不存在"); ErrorCode INVENTORYMOVE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_133_001, "库存转移记录子不存在"); @@ -684,6 +707,7 @@ public interface ErrorCodeConstants { //调拨出库任务ErrorCode ErrorCode TRANSFERISSUE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_137_000, "调拨出库任务主不存在"); ErrorCode TRANSFERISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_138_001, "调拨出库任务子不存在"); + ErrorCode TRANSFERISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_137_002, "调拨出库任务状态错误"); //调拨出库记录ErrorCode ErrorCode TRANSFERISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_139_000, "调拨出库记录主不存在"); ErrorCode TRANSFERISSUE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_139_001, "调拨出库记录子不存在"); @@ -693,6 +717,7 @@ public interface ErrorCodeConstants { //调拨入库任务ErrorCode ErrorCode TRANSFERRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_141_000, "调拨入库任务主不存在"); ErrorCode TRANSFERRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_141_001, "调拨入库任务子不存在"); + ErrorCode TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_141_002, "调拨入库任务状态错误"); //调拨入库记录ErrorCode ErrorCode TRANSFERRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_142_000, "调拨入库记录主不存在"); ErrorCode TRANSFERRECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_142_001, "调拨入库记录子不存在"); @@ -702,6 +727,7 @@ public interface ErrorCodeConstants { //计划外出库任务ErrorCode ErrorCode UNPLANNEDISSUE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_144_000, "计划外出库任务主不存在"); ErrorCode UNPLANNEDISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_144_001, "计划外出库任务子不存在"); + ErrorCode UNPLANNEDISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_144_002, "计划外出库任务状态错误"); //计划外出库记录ErrorCode ErrorCode UNPLANNEDISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_145_000, "计划外出库记录主不存在"); ErrorCode UNPLANNEDISSUE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_145_001, "计划外出库记录子不存在"); @@ -711,6 +737,7 @@ public interface ErrorCodeConstants { //计划外入库任务ErrorCode ErrorCode UNPLANNEDRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_147_000, "计划外入库任务主不存在"); ErrorCode UNPLANNEDRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_147_001, "计划外入库任务子不存在"); + ErrorCode UNPLANNEDRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_147_002, "计划外入库任务状态错误"); //计划外入库记录ErrorCode ErrorCode UNPLANNEDRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_148_000, "计划外入库记录主不存在"); ErrorCode UNPLANNEDRECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_148_001, "计划外入库记录子不存在"); @@ -720,6 +747,7 @@ public interface ErrorCodeConstants { //报废出库任务ErrorCode ErrorCode SCRAP_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_150_000, "报废出库任务主不存在"); ErrorCode SCRAP_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_150_001, "报废出库任务子不存在"); + ErrorCode SCRAP_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_150_002, "报废出库任务状态不存在"); //报废出库记录ErrorCode ErrorCode SCRAP_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_151_000, "报废出库记录主不存在"); ErrorCode SCRAP_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_151_001, "报废出库记录子不存在"); @@ -732,6 +760,7 @@ public interface ErrorCodeConstants { //盘点任务ErrorCode ErrorCode COUNT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_154_000, "盘点任务主不存在"); ErrorCode COUNT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_154_001, "盘点任务子不存在"); + ErrorCode COUNT_JOB_MAIN_STATUS_ERROR= new ErrorCode(1_000_154_002, "盘点任务状态错误"); //盘点申请ErrorCode ErrorCode COUNT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_155_000, "盘点申请主不存在"); ErrorCode COUNT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_155_001, "盘点申请子不存在"); @@ -761,8 +790,5 @@ public interface ErrorCodeConstants { //生产线与零件关系ErrorCode ErrorCode PRODUCTIONLINEITEM_PITEM_NOT_EXISTS = new ErrorCode(1_000_166_000, "生产线与零件关系无效"); - //生产线与零件关系ErrorCode - ErrorCode PDOCK_NOT_EXISTS = new ErrorCode(1_000_166_000, "收货口不存在"); - } diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java new file mode 100644 index 00000000..f02292d4 --- /dev/null +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java @@ -0,0 +1,35 @@ +package com.win.module.wms.enums.job; + +import com.win.module.wms.enums.order.OrderStatusEnum; + +public enum JobStatusEnum { + OPEN(1), // 待处理 + DOING(2), // 执行中 + DONE(3), // 完成 + CLOSED(4), // 关闭 + CANCELLED(5); // 放弃 + + private final Integer code; + + JobStatusEnum(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + /** + * 用状态值获取枚举 + * @param status + * @return + */ + static JobStatusEnum getJobStatusEnum(int status) { + for (JobStatusEnum jobStatusEnum : values()) { + if (jobStatusEnum.getCode() == status) { + return jobStatusEnum; + } + } + return OPEN; + } +} diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java new file mode 100644 index 00000000..ef8ef0df --- /dev/null +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java @@ -0,0 +1,97 @@ +package com.win.module.wms.enums.job; + +import com.win.module.wms.enums.job.JobStatusEnum; + +/** + * 订单状态机 + */ +public class JobStatusState { + + /** + * 当前状态枚举 + */ + private JobStatusEnum jobStatusEnum; + + /** + * 构造函数，默认创建 + */ + public JobStatusState() { + this.jobStatusEnum = jobStatusEnum.OPEN; + } + + /** + * 构造函数，当前状态 + * @param status + */ + public JobStatusState(int status) { + this.jobStatusEnum = jobStatusEnum.getJobStatusEnum(status); + } + + /** + * 构造函数，当前状态枚举 + * @param jobStatusEnum + */ + public JobStatusState(JobStatusEnum jobStatusEnum) { + this.jobStatusEnum = jobStatusEnum; + } + + /** + * 当前状态是否可以修改为执行中状态 + * @return + */ + public boolean doing() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.OPEN.getCode()) { + this.jobStatusEnum = jobStatusEnum.DOING; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 当前状态是否可以修改为关闭状态 + * @return + */ + public boolean closed() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.OPEN.getCode()) { + this.jobStatusEnum = jobStatusEnum.CLOSED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 当前状态是否可以修改为完成状态 + * @return + */ + public boolean done() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.DOING.getCode()) { + this.jobStatusEnum = jobStatusEnum.DONE; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + /** + * 当前状态是否可以修改为放弃状态 + * @return + */ + public boolean cancelled() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.DOING.getCode()) { + this.jobStatusEnum = jobStatusEnum.CANCELLED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 获取可执行的状态机 + * @return + */ + public JobStatusEnum getState() { + return jobStatusEnum; + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java index 202d272a..cfa80526 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java @@ -23,12 +23,6 @@ public class ProductionDetailBaseVO { @Schema(description = "id", example = "id") private Long id; - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java index 5658eb64..005fe746 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java @@ -22,12 +22,6 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class ProductionDetailExcelVO { - @ExcelProperty("订单号") - private String woNumber; - - @ExcelProperty("订单行") - private String woLine; - @ExcelProperty("Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java index 2a97c76b..cac5ce7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java @@ -15,12 +15,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class ProductionDetailExportReqVO { - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java index 63b99baa..2205f60b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java @@ -17,12 +17,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class ProductionDetailPageReqVO extends PageParam { - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java index a6467c1d..36d09875 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java @@ -80,4 +80,10 @@ public class ProductionMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java index 8175e391..2bdaf20e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java @@ -74,4 +74,9 @@ public class ProductionMainExcelVO { @ExcelProperty("是否可用") private String available; + @ExcelProperty("订单号") + private String woNumber; + + @ExcelProperty("订单行") + private String woLine; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java index 6785618a..cf86c928 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java @@ -69,4 +69,10 @@ public class ProductionMainExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java index 6ebd9f6d..80d1e028 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java @@ -71,4 +71,9 @@ public class ProductionMainPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index 39f155e7..2c55146c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; import com.win.module.wms.controller.purchasereturnJob.vo.*; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -16,12 +18,15 @@ import java.io.IOException; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; +import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobMainConvert; @@ -35,7 +40,8 @@ public class PurchasereturnJobMainController { @Resource private PurchasereturnJobMainService purchasereturnJobMainService; - + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @PostMapping("/create") @Operation(summary = "创建采购退货任务主") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:create')") @@ -68,6 +74,15 @@ public class PurchasereturnJobMainController { PurchasereturnJobMainDO purchasereturnJobMain = purchasereturnJobMainService.getPurchasereturnJobMain(id); return success(PurchasereturnJobMainConvert.INSTANCE.convert(purchasereturnJobMain)); } + @GetMapping("/get111") + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS); + } + } @GetMapping("/list") @Operation(summary = "获得采购退货任务主列表") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java index a8c12723..6a8d2205 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java @@ -22,11 +22,11 @@ public class SalepriceBaseVO { @Schema(description = "客户代码", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "客户代码不能为空") - private String customercode; + private String customerCode; @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "物料代码不能为空") - private String itemcode; + private String itemCode; @Schema(description = "货币", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "货币不能为空") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java index b2cf4e61..d9aa96f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java @@ -19,10 +19,10 @@ import java.time.LocalDateTime; public class SalepriceExcelVO { @ExcelProperty("客户代码") - private String customercode; + private String customerCode; @ExcelProperty("物料代码") - private String itemcode; + private String itemCode; @ExcelProperty(value = "货币", converter = DictConvert.class) @DictFormat("currency") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java index f0a53277..efa57c19 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java @@ -14,10 +14,10 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class SalepriceExportReqVO { @Schema(description = "客户代码") - private String customercode; + private String customerCode; @Schema(description = "物料代码") - private String itemcode; + private String itemCode; @Schema(description = "货币") private String currency; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java index 99c9ff90..00d77053 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java @@ -28,10 +28,10 @@ public class SalepriceImportExcelVo { @ExcelProperty("客户代码") - private String customercode; + private String customerCode; @ExcelProperty("物料代码") - private String itemcode; + private String itemCode; @ExcelProperty(value = "货币", converter = DictConvert.class) @DictFormat(DictTypeConstants.CURRENCY) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java index 93d2b4db..99355ef4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java @@ -19,10 +19,10 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class SalepricePageReqVO extends PageParam { @Schema(description = "客户代码") - private String customercode; + private String customerCode; @Schema(description = "物料代码") - private String itemcode; + private String itemCode; @Schema(description = "货币") private String currency; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index 0f103eb1..a412fb25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java @@ -1,6 +1,10 @@ package com.win.module.wms.controller.supplierdeliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -16,12 +20,16 @@ import java.io.IOException; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; +import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; @@ -36,7 +44,10 @@ public class SupplierdeliverRecordMainController { @Resource private SupplierdeliverRecordMainService supplierdeliverRecordMainService; - + @Resource + private SupplierdeliverRecordMainMapper supplierdeliverRecordMainMapper; + @Resource + private SupplierdeliverRecordDetailMapper supplierdeliverRecordDetailMapper; @PostMapping("/create") @Operation(summary = "创建供应商发货记录主") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java index 097d3a37..c4ad28a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java @@ -1,14 +1,8 @@ package com.win.module.wms.dal.dataobject.location; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java index f8f9109f..5cf0b23e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.production; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -29,14 +30,6 @@ public class ProductionDetailDO extends BaseDO { */ @TableId private Long id; - /** - * 订单号 - */ - private String woNumber; - /** - * 订单行 - */ - private String woLine; /** * Bom版本 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java index f694e119..39da10bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.production; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -108,4 +109,13 @@ public class ProductionMainDO extends BaseDO { */ private String available; + /** + * 订单号 + */ + private String woNumber; + /** + * 订单行 + */ + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java index 47544cc8..9ae06553 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java @@ -35,10 +35,12 @@ public class RuleDO extends BaseDO { /** * 代码 */ + @TableField(value = "`code`") private String code; /** * 名称 */ + @TableField(value = "`name`") private String name; /** * 描述 @@ -47,6 +49,7 @@ public class RuleDO extends BaseDO { /** * 条件 */ + @TableField(value = "`condition`") private String condition; /** * 配置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java index 66aeaa97..bad6c32d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.saleprice; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -34,11 +35,11 @@ public class SalepriceDO extends BaseDO { /** * 客户代码 */ - private String customercode; + private String customerCode; /** * 物料代码 */ - private String itemcode; + private String itemCode; /** * 货币 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java index 5c9784d6..ebbd8983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java @@ -20,8 +20,6 @@ public interface ProductionDetailMapper extends BaseMapperX default PageResult selectPage(ProductionDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ProductionDetailDO::getWoNumber, reqVO.getWoNumber()) - .eqIfPresent(ProductionDetailDO::getWoLine, reqVO.getWoLine()) .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductionDetailDO::getGoodQty, reqVO.getGoodQty()) .eqIfPresent(ProductionDetailDO::getNotGoodQty, reqVO.getNotGoodQty()) @@ -40,8 +38,6 @@ public interface ProductionDetailMapper extends BaseMapperX default List selectList(ProductionDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ProductionDetailDO::getWoNumber, reqVO.getWoNumber()) - .eqIfPresent(ProductionDetailDO::getWoLine, reqVO.getWoLine()) .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductionDetailDO::getGoodQty, reqVO.getGoodQty()) .eqIfPresent(ProductionDetailDO::getNotGoodQty, reqVO.getNotGoodQty()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java index b995c38b..4b908faa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import org.apache.ibatis.annotations.Mapper; @@ -37,6 +38,8 @@ public interface ProductionMainMapper extends BaseMapperX { .betweenIfPresent(ProductionMainDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(ProductionMainDO::getUpdater, reqVO.getUpdater()) .eqIfPresent(ProductionMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(ProductionMainDO::getWoNumber, reqVO.getWoNumber()) + .eqIfPresent(ProductionMainDO::getWoLine, reqVO.getWoLine()) .orderByDesc(ProductionMainDO::getId)); } @@ -59,6 +62,8 @@ public interface ProductionMainMapper extends BaseMapperX { .betweenIfPresent(ProductionMainDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(ProductionMainDO::getUpdater, reqVO.getUpdater()) .eqIfPresent(ProductionMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(ProductionMainDO::getWoNumber, reqVO.getWoNumber()) + .eqIfPresent(ProductionMainDO::getWoLine, reqVO.getWoLine()) .orderByDesc(ProductionMainDO::getId)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java index 0b383400..91ee4123 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java @@ -19,13 +19,13 @@ import java.util.List; public interface SalepriceMapper extends BaseMapperX { default SalepriceDO selectByItemCode(String itemcode) { - return selectOne(SalepriceDO::getItemcode, itemcode); + return selectOne(SalepriceDO::getItemCode, itemcode); } default PageResult selectPage(SalepricePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(SalepriceDO::getCustomercode, reqVO.getCustomercode()) - .eqIfPresent(SalepriceDO::getItemcode, reqVO.getItemcode()) + .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) + .eqIfPresent(SalepriceDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(SalepriceDO::getCurrency, reqVO.getCurrency()) .eqIfPresent(SalepriceDO::getPrice, reqVO.getPrice()) .eqIfPresent(SalepriceDO::getAvailable, reqVO.getAvailable()) @@ -39,8 +39,8 @@ public interface SalepriceMapper extends BaseMapperX { default List selectList(SalepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(SalepriceDO::getCustomercode, reqVO.getCustomercode()) - .eqIfPresent(SalepriceDO::getItemcode, reqVO.getItemcode()) + .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) + .eqIfPresent(SalepriceDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(SalepriceDO::getCurrency, reqVO.getCurrency()) .eqIfPresent(SalepriceDO::getPrice, reqVO.getPrice()) .eqIfPresent(SalepriceDO::getAvailable, reqVO.getAvailable()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index be82ea1c..b2255090 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -70,5 +70,12 @@ public interface CountJobMainService { * @return 盘点任务主列表 */ List getCountJobMainList(CountJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 盘点任务主列表 + */ + public CountJobMainDO countJobMainDoStatusRight(String pnumber,String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 5516c01d..c10b8da1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.countJob.vo.CountJobMainCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; @@ -82,5 +83,15 @@ public class CountJobMainServiceImpl implements CountJobMainService { public List getCountJobMainList(CountJobMainExportReqVO exportReqVO) { return countJobMainMapper.selectList(exportReqVO); } - + public CountJobMainDO countJobMainDoStatusRight(String pnumber,String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + CountJobMainDO countJobMainDO = countJobMainMapper.selectOne(queryWrapper); + if(countJobMainDO != null){ + return countJobMainDO; + }else { + throw exception(COUNT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index d22caba5..b8d6bd07 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -70,6 +70,11 @@ public interface CustomerService { List getCustomerList(CustomerExportReqVO exportReqVO); List importCustomerList(List customers, Integer mode, Boolean updatePart); - - public CustomerDO CustomerExist(String code); + /** + * 校验客户信息有效 + * + * @param pcustomerCode 客户代码 + * @return 客户列表 + */ + public CustomerDO selectCustomerExist(String pcustomerCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index 73ab8a5c..7aaea3a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -11,6 +11,7 @@ import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.customer.CustomerMapper; import org.springframework.stereotype.Service; @@ -171,18 +172,15 @@ public class CustomerServiceImpl implements CustomerService { throw exception(CUSTOMER_AVAILABLE_NOT_EXISTS); } } - - public CustomerDO CustomerExist(String code) { + @Override + public CustomerDO selectCustomerExist(String pcustomerCode) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("code",code); - CustomerDO customerDO =customerMapper.selectOne(queryWrapper); - if(customerDO != null&& customerDO.getAvailable().equals("TRUE")){ + queryWrapper.eq("customer_code",pcustomerCode); + CustomerDO customerDO = customerMapper.selectOne(queryWrapper); + if(customerDO != null && "TRUE".equals(customerDO.getAvailable())){ return customerDO; }else { - throw exception(WAREHOUSE_NOT_EXISTS); + throw exception(CUSTOMER_NOT_EXISTS); } } - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java index c3fdc324..3bb42457 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java @@ -70,4 +70,12 @@ public interface CustomerdockService { List getCustomerdockList(CustomerdockExportReqVO exportReqVO); List importCustomerdockList(List customerdocks, Integer mode, Boolean updatePart); + + /** + * 客户地点(月台)有效,状态正确 + * + * @param code 代码 + * @return 客户月台列表 + */ + public CustomerdockDO CustomerExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index c4eb86df..af75bc11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -10,7 +10,6 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; -import com.win.module.wms.dal.dataobject.customer.CustomerDO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.mysql.customerdock.CustomerdockMapper; import org.springframework.stereotype.Service; @@ -185,11 +184,12 @@ public class CustomerdockServiceImpl implements CustomerdockService { throw exception(CUSTOMERDOCK_AVAILABLE_NOT_EXISTS); } } + @Override public CustomerdockDO CustomerExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); CustomerdockDO customerdockDO =customerdockMapper.selectOne(queryWrapper); - if(customerdockDO != null&& customerdockDO.getAvailable().equals("TRUE")){ + if(customerdockDO != null&& "TRUE".equals(customerdockDO.getAvailable())){ return customerdockDO; }else { throw exception(CUSTOMERDOCK_NOT_EXISTS); 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 89f4e33a..d408794a 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 @@ -9,6 +9,8 @@ import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainP import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; /** * 客户退货任务主 Service 接口 @@ -70,5 +72,31 @@ public interface CustomerreturnJobMainService { * @return 客户退货任务主列表 */ List getCustomerreturnJobMainList(CustomerreturnJobMainExportReqVO exportReqVO); - + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + /** + * 校验销售订单明细 + * + * @param psoNumber 单据号 + * @param psoLine 行号 + * @param pitemCode 物品代码 + * @return 采购订单子列表 + */ + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public CustomerreturnJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); } 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 72509360..eb4cce47 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 @@ -1,9 +1,14 @@ package com.win.module.wms.service.customerreturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.sale.SaleMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +36,10 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe @Resource private CustomerreturnJobMainMapper customerreturnJobMainMapper; + @Resource + private PurchaseMainService purchaseMainService; + @Resource + private SaleMainService saleMainService; @Override public Long createCustomerreturnJobMain(CustomerreturnJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +91,27 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe public List getCustomerreturnJobMainList(CustomerreturnJobMainExportReqVO exportReqVO) { return customerreturnJobMainMapper.selectList(exportReqVO); } - + //校验采购订单明细 + @Override + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + return purchaseDetailDO; + } + @Override + public SaleDetailDO saleDetailExist(String psoNumber,String psoLine,String pitemCode) { + SaleDetailDO saleDetailDO = saleMainService.selectSaleDetailDoExist(psoNumber, psoLine, pitemCode); + return saleDetailDO; + } + @Override + public CustomerreturnJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + CustomerreturnJobMainDO customerreturnJobMainDO = customerreturnJobMainMapper.selectOne(queryWrapper); + if(customerreturnJobMainDO != null){ + return customerreturnJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } 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 455c893d..76717da3 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 @@ -9,6 +9,8 @@ import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; /** * 发货任务主 Service 接口 @@ -70,5 +72,31 @@ public interface DeliverJobMainService { * @return 发货任务主列表 */ List getDeliverJobMainList(DeliverJobMainExportReqVO exportReqVO); - + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + /** + * 校验采销售订单明细 + * + * @param psoNumber 单据号 + * @param pitemCode 物品代码 + * @param psoLine 行号 + * @return 销售订单子列表 + */ + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 发货任务主列表 + */ + public DeliverJobMainDO deliverJobMainDoStatusRight(String pnumber, String pstatus); } 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 97385423..ac1da7b9 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 @@ -1,9 +1,16 @@ package com.win.module.wms.service.deliverJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.sale.SaleMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +38,11 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { @Resource private DeliverJobMainMapper deliverJobMainMapper; + @Resource + private PurchaseMainService purchaseMainService; + @Resource + private SaleMainService saleMainService; + @Override public Long createDeliverJobMain(DeliverJobMainCreateReqVO createReqVO) { // 插入 @@ -83,4 +95,27 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { return deliverJobMainMapper.selectList(exportReqVO); } + //校验采购订单明细 + @Override + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode,String psupplierCode,String plineNumber) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + return purchaseDetailDO; + } + @Override + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode) { + SaleDetailDO saleDetailDO = saleMainService.selectSaleDetailDoExist(psoNumber, psoLine, pitemCode); + return saleDetailDO; + } + @Override + public DeliverJobMainDO deliverJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + DeliverJobMainDO deliverJobMainDO = deliverJobMainMapper.selectOne(queryWrapper); + if(deliverJobMainDO != null){ + return deliverJobMainDO; + }else { + throw exception(DELIVER_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index 2ae4d02b..8a8515cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -70,6 +70,12 @@ public interface DockService { List getDockList(DockExportReqVO exportReqVO); List dockimportDockList(List docks, Integer mode, Boolean updatePart); - //收货口有效，状态正确 - public DockDO DockExist(String code); + + /** + * 校验收货口有效，状态正确 + * + * @param code 代码 + * @return 月台列表 + */ + DockDO DockExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index d8f39d6a..e3a73759 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java @@ -10,7 +10,6 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.dock.DockMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -185,15 +184,15 @@ public class DockServiceImpl implements DockService { } } - //收货口有效，状态正确 + @Override public DockDO DockExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); DockDO dockDO = dockMapper.selectOne(queryWrapper); - if(dockDO != null&& dockDO.getAvailable().equals("TRUE")){ + if(dockDO != null&& "TRUE".equals(dockDO.getAvailable())){ return dockDO; }else { - throw exception(PDOCK_NOT_EXISTS); + throw exception(DOCK_NOT_EXISTS); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index 181afeab..c3177fc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -70,5 +70,12 @@ public interface InspectJobMainService { * @return 检验任务主列表 */ List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 66a9c21e..05e86117 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.inspectJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); } - + @Override + public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectOne(queryWrapper); + if(inspectJobMainDO != null){ + return inspectJobMainDO; + }else { + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index c520d5be..bc146903 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -70,5 +70,12 @@ public interface InventorymoveJobMainService { * @return 库存转移任务主列表 */ List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index a529a2bb..44ce1a36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.inventorymoveJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ public List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO) { return inventorymoveJobMainMapper.selectList(exportReqVO); } - + @Override + public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + InventorymoveJobMainDO inventorymoveJobMainDO = inventorymoveJobMainMapper.selectOne(queryWrapper); + if(inventorymoveJobMainDO != null){ + return inventorymoveJobMainDO; + }else { + throw exception(INVENTORYMOVE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index 675bcfec..ce9b332b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -70,5 +70,12 @@ public interface IssueJobMainService { * @return 发料任务主列表 */ List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public IssueJobMainDO issueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index f2880092..deb2791e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.issueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { public List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO) { return issueJobMainMapper.selectList(exportReqVO); } - + @Override + public IssueJobMainDO issueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + IssueJobMainDO issueJobMainDO = issueJobMainMapper.selectOne(queryWrapper); + if(issueJobMainDO != null){ + return issueJobMainDO; + }else { + throw exception(ISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java index 6401aaa6..755e48ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java @@ -79,6 +79,11 @@ public interface ItembasicService { List importItembasicList(List importItembasics, Integer mode,boolean updatePart); public ItembasicDO selectItembasic(String code); - + /** + * 校验物料有效，状态正确 + * + * @param itemCode 物品代码 + * @return 物品基本信息列表 + */ public ItembasicDO itemCodeExist(String itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index b6dc09e4..f76c283c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -251,7 +251,7 @@ public class ItembasicServiceImpl implements ItembasicService { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); ItembasicDO itembasicDO = itembasicMapper.selectOne(queryWrapper); - if(itembasicDO != null && itembasicDO.getAvailable().equals("TRUE")){ + if(itembasicDO != null && "ENABLE".equals(itembasicDO.getStatus())){ return itembasicDO; }else { throw exception(ITEMBASIC_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index ff121a63..a2d8cb25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.location; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.location.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.dal.dataobject.location.LocationDO; import javax.validation.Valid; @@ -70,5 +71,31 @@ public interface LocationService { List getLocationList(LocationExportReqVO exportReqVO); List importLocationList(List locations, Integer mode, Boolean updatePart); - + /** + * 库位验证 + * 从库位号有效，状态正确，开关正确 + * 到库位号有效，状态正确，开关正确 + * 共用同一个方法 + * @param locationCode 库位 + * @return 库位信息 + */ + public LocationDO selectLocationExist(String locationCode); + /** + * 获取当前库位采用的获取库位存储策略信息 + * + * @param warehouseCode 仓库代码 + * @param areaCode 区域代码 + * @param locationGroupCode 库位组code + * @param plocationCode 库位 + * @return 库位存储策略信息 + */ + //TODO 后期具体业务时需判断策略相关标签状态(还没写) + public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode); + /** + * 零件库位关系有效 + * + * @param pitemCode 物品代码 + * @return 上架策略信息 + */ + public RuleRespVO selectLocationAndModRelation(String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index e08001cc..9be11678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -8,10 +8,12 @@ import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.location.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.location.LocationMapper; +import com.win.module.wms.service.rule.RuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; @@ -35,6 +37,8 @@ public class LocationServiceImpl implements LocationService { @Resource private LocationMapper locationMapper; + @Resource + private RuleService ruleService; @Override public Long createLocation(LocationCreateReqVO createReqVO) { @@ -216,6 +220,31 @@ public class LocationServiceImpl implements LocationService { throw exception(LOCATION_AVAILABLE_NOT_EXISTS); } } - - + //调用公共方法查询库位信息 + public LocationDO selectLocation(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + LocationDO locationDO = locationMapper.selectOne(queryWrapper); + if(locationDO != null && "TRUE".equals(locationDO.getAvailable())){ + return locationDO; + }else { + throw exception(LOCATION_NOT_EXISTS); + } + } + public LocationDO selectLocationExist(String locationCode) { + LocationDO locationDO = selectLocation(locationCode); + return locationDO; + } + public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode) { + RuleRespVO ruleRespVO = ruleService.warehouseStorage(warehouseCode,areaCode,locationGroupCode,plocationCode); + return ruleRespVO; + } + public RuleRespVO selectLocationAndModRelation(String pitemCode) { + RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null); + if(grounding != null){ + return grounding; + }else { + throw exception(LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index 433a6711..d3099f77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -70,8 +70,11 @@ public interface PackageService { * @return 包装列表 */ List getPackageList(PackageExportReqVO exportReqVO); - - PackageDO LabelExist(String number); - - + /** + * 校验标签有效 + * + * @param pnumber 包装好 + * @return 包装列表 + */ + PackageDO LabelExist(String pnumber); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 14ff885b..06408550 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -86,9 +86,9 @@ public class PackageServiceImpl implements PackageService { return packageMapper.selectList(exportReqVO); } @Override - public PackageDO LabelExist(String number) { + public PackageDO LabelExist(String pnumber) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("number",number); + queryWrapper.eq("number",pnumber); PackageDO packageDO = packageMapper.selectOne(queryWrapper); if(packageDO != null){ return packageDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index 1346e41f..60eec383 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -70,5 +70,12 @@ public interface PickJobMainService { * @return 拣料任务主列表 */ List getPickJobMainList(PickJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 767efd54..1950a3ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class PickJobMainServiceImpl implements PickJobMainService { public List getPickJobMainList(PickJobMainExportReqVO exportReqVO) { return pickJobMainMapper.selectList(exportReqVO); } - + @Override + public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PickJobMainDO pickJobMainDO = pickJobMainMapper.selectOne(queryWrapper); + if(pickJobMainDO != null){ + return pickJobMainDO; + }else { + throw exception(PICK_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index a39935aa..979745be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -70,5 +70,13 @@ public interface ProductdismantleJobMainService { * @return 制品拆解任务主列表 */ List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 1b641cd9..286107d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productdismantleJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa public List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO) { return productdismantleJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductdismantleJobMainDO productdismantleJobMainDO = productdismantleJobMainMapper.selectOne(queryWrapper); + if(productdismantleJobMainDO != null){ + return productdismantleJobMainDO; + }else { + throw exception(PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 3bfce589..0ff47f0e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,13 @@ public interface ProductionMainService { * @return 生产计划主列表 */ List getProductionMainList(ProductionMainExportReqVO exportReqVO); + /** + * 校验生产计划 + * + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @return 生产计划子列表 + */ + ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode); } 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 63027478..9da997ad 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,9 +1,17 @@ package com.win.module.wms.service.production; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; +import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -15,6 +23,7 @@ import com.win.framework.common.pojo.PageResult; import com.win.module.wms.convert.production.ProductionMainConvert; import com.win.module.wms.dal.mysql.production.ProductionMainMapper; +import org.springframework.web.bind.annotation.GetMapping; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -31,6 +40,11 @@ public class ProductionMainServiceImpl implements ProductionMainService { @Resource private ProductionMainMapper productionMainMapper; + @Resource + private ProductionDetailMapper productionDetailMapper; + @Resource + private ProductreceiptJobDetailMapper productreceiptJobDetailMapper; + @Override public Long createProductionMain(ProductionMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +96,29 @@ public class ProductionMainServiceImpl implements ProductionMainService { public List getProductionMainList(ProductionMainExportReqVO exportReqVO) { return productionMainMapper.selectList(exportReqVO); } - + //公共方法 校验生产计划 + @Override + public ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number", pnumber); + ProductionMainDO productionMainDO = productionMainMapper.selectOne(queryWrapper); + if (productionMainDO != null && "TRUE".equals(productionMainDO.getAvailable())) { + if (null != productionMainDO.getStatus() && !"CLOSED".equals(productionMainDO.getStatus())) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id", productionMainDO.getId()); + queryWrapper1.eq("item_code", pitemCode); + queryWrapper1.eq("number", pnumber); + ProductionDetailDO productionDetailDO = productionDetailMapper.selectOne(queryWrapper1); + if (productionDetailDO != null && "TRUE".equals(productionDetailDO.getAvailable())) { + return productionDetailDO; + } else { + throw exception(PRODUCTION_MAIN_MASSAGE_EXISTS); + } + } else{ + throw exception(PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS); + } + } else { + throw exception(PRODUCTION_MAIN_NUMBER_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index c56cbf9f..1917c357 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java @@ -180,4 +180,15 @@ public class ProductionlineServiceImpl implements ProductionlineService { + //生产线有效，状态正确 + public ProductionlineDO pcodeExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + ProductionlineDO productionlineDO = productionlineMapper.selectOne(queryWrapper); + if(productionlineDO != null && productionlineDO.getAvailable().equals("TRUE")){ + return productionlineDO; + }else { + throw exception(PRODUCTIONLINE_CODE_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index 0fd5a2b6..06dfccc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.productionlineitem; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionlineitem.vo.*; -import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import javax.validation.Valid; @@ -71,5 +70,12 @@ public interface ProductionlineitemService { List getProductionlineitemList(ProductionlineitemExportReqVO exportReqVO); List importProductionlineItemList(List productionlineItems, Integer mode, Boolean updatePart); - public ProductionlineitemDO ProductionlineitemExist(String code, String linecode); + /** + * 零件生产线关系有效 + * + * @param pproductionLineCode 产线代码 + * @param pitemCode 物品代码 + * @return 生产线物料关系 + */ + public List pProductionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode); } 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 c34f71a0..aeb09207 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 @@ -8,7 +8,6 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; -import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import com.win.module.wms.dal.mysql.productionlineitem.ProductionlineitemMapper; @@ -113,13 +112,12 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } }); //错误不为空并非部分更新，手工回滚 - if (!errorList.isEmpty() && !updatePart) { + if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } return errorList; } - - private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode, String productionLineCode, String itemCode, String available) { + private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode,String productionLineCode,String itemCode,String available) { // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确 DataPermissionUtils.executeIgnore(() -> { validateProductionlineitemExists(id); @@ -167,19 +165,21 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService throw exception(PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS); } } - - public ProductionlineitemDO ProductionlineitemExist(String code, String linecode) { + //零件生产线关系有效 + public List pProductionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("code", code); - queryWrapper.eq("linecode", linecode); - ProductionlineitemDO productionlineitemDO = productionlineitemMapper.selectOne(queryWrapper); - if (productionlineitemDO != null && productionlineitemDO.getAvailable().equals("TRUE")) { - return productionlineitemDO; - } else { - throw exception(CUSTOMERDOCK_NOT_EXISTS); + queryWrapper.eq("production_line_code",pproductionLineCode); + queryWrapper.eq("item_code",pitemCode); + List productionlineitemDO = productionlineitemMapper.selectList(queryWrapper); + if( productionlineitemDO != null){ + for (ProductionlineitemDO aDo : productionlineitemDO) { + if("TRUE".equals(aDo.getAvailable())){ + return productionlineitemDO; + } + } + }else { + throw exception(PRODUCTIONLINEITEM_NOT_EXISTS); } + return productionlineitemDO; } - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index 0e49c928..7143b5a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface ProductionreceiptJobMainService { * @return 生产收料任务主列表 */ List getProductionreceiptJobMainList(ProductionreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index db51e23e..18a3eeee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productionreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -83,4 +85,16 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob return productionreceiptJobMainMapper.selectList(exportReqVO); } + @Override + public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductionreceiptJobMainDO productionreceiptJobMainDO = productionreceiptJobMainMapper.selectOne(queryWrapper); + if(productionreceiptJobMainDO != null){ + return productionreceiptJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index 10abf843..21e1effb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -70,5 +70,12 @@ public interface ProductionreturnJobMainService { * @return 生产退料任务主列表 */ List getProductionreturnJobMainList(ProductionreturnJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index 6f85c384..6e10fbd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productionreturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,17 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa public List getProductionreturnJobMainList(ProductionreturnJobMainExportReqVO exportReqVO) { return productionreturnJobMainMapper.selectList(exportReqVO); } + @Override + public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductionreturnJobMainDO productionreturnJobMainDO = productionreturnJobMainMapper.selectOne(queryWrapper); + if(productionreturnJobMainDO != null){ + return productionreturnJobMainDO; + }else { + throw exception(PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index ddd94dfe..44e00239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -70,5 +70,12 @@ public interface ProductputawayJobMainService { * @return 制品上架任务主列表 */ List getProductputawayJobMainList(ProductputawayJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index a12d1ba3..745e32b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productputawayJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe public List getProductputawayJobMainList(ProductputawayJobMainExportReqVO exportReqVO) { return productputawayJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductputawayJobMainDO productputawayJobMainDO = productputawayJobMainMapper.selectOne(queryWrapper); + if(productputawayJobMainDO != null){ + return productputawayJobMainDO; + }else { + throw exception(PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index 370db3d2..1ab31259 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainC import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,20 @@ public interface ProductreceiptJobMainService { * @return 制品收货任务主列表 */ List getProductreceiptJobMainList(ProductreceiptJobMainExportReqVO exportReqVO); - + /** + * /生产(明细)有效，状态正确 + * + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @return 生产计划子表信息列表 + */ + public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index 15f560c9..480aea44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -1,9 +1,13 @@ package com.win.module.wms.service.productreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.service.production.ProductionMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +35,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe @Resource private ProductreceiptJobMainMapper productreceiptJobMainMapper; + @Resource + private ProductionMainService productionMainService; + @Override public Long createProductreceiptJobMain(ProductreceiptJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +89,22 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe public List getProductreceiptJobMainList(ProductreceiptJobMainExportReqVO exportReqVO) { return productreceiptJobMainMapper.selectList(exportReqVO); } - + //生产(明细)有效，状态正确 + @Override + public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode) { + ProductionDetailDO productionDetailDO = productionMainService.planProductionDetailDoExist(pnumber, pitemCode); + return productionDetailDO; + } + @Override + public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductreceiptJobMainDO productreceiptJobMainDO = productreceiptJobMainMapper.selectOne(queryWrapper); + if(productreceiptJobMainDO != null){ + return productreceiptJobMainDO; + }else { + throw exception(PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 80091510..35f945ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -70,5 +70,12 @@ public interface ProductscrapJobMainService { * @return 制品报废任务主列表 */ List getProductscrapJobMainList(ProductscrapJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductscrapJobMainDO productscrapJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 1b3beccf..2338c8f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productscrapJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic public List getProductscrapJobMainList(ProductscrapJobMainExportReqVO exportReqVO) { return productscrapJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductscrapJobMainDO productscrapJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductscrapJobMainDO productscrapJobMainDO = productscrapJobMainMapper.selectOne(queryWrapper); + if(productscrapJobMainDO != null){ + return productscrapJobMainDO; + }else { + throw exception(PRODUCTSCRAP_JOB_MAIN_STATUS_ERROR); + } + } } 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 71971a33..da14ac22 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 @@ -7,6 +7,7 @@ import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,15 @@ public interface PurchaseMainService { * @return 采购订单主列表 */ List getPurchaseMainList(PurchaseMainExportReqVO exportReqVO); + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber); } 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 375de850..c1648292 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,9 +1,12 @@ package com.win.module.wms.service.purchase; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +34,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { @Resource private PurchaseMainMapper purchaseMainMapper; + @Resource + private PurchaseDetailMapper purchaseDetailMapper; @Override public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +87,31 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { public List getPurchaseMainList(PurchaseMainExportReqVO exportReqVO) { return purchaseMainMapper.selectList(exportReqVO); } - + //公共方法 校验采购订单明细 + @Override + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("supplier_code",psupplierCode); + PurchaseMainDO purchaseMainDO = purchaseMainMapper.selectOne(queryWrapper); + if(purchaseMainDO != null && "TRUE".equals(purchaseMainDO.getAvailable())){ + if(!"CLOSED".equals(purchaseMainDO.getStatus())){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id",purchaseMainDO.getId()); + queryWrapper1.eq("number",pnumber); + queryWrapper1.eq("item_code",pitemCode); + queryWrapper1.eq("line_number",plineNumber); + PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); + if(purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())){ + return purchaseDetailDO; + }else { + throw exception(PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS); + } + }else { + throw exception(PURCHASE_DETAIL_NUMBER_NOT_EXISTS); + } + }else { + throw exception(PURCHASE_DETAIL_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 27f33a9a..af02e362 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -5,6 +5,7 @@ import javax.validation.*; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; /** * 采购收货任务主 Service 接口 @@ -66,5 +67,12 @@ public interface PurchasereceiptJobMainService { * @return 采购收货任务主列表 */ List getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index a2d64f46..73398f2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -1,5 +1,9 @@ package com.win.module.wms.service.purchasereceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -26,6 +30,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Resource private PurchasereceiptJobMainMapper purchasereceiptJobMainMapper; + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @Override public Long createPurchasereceiptJobMain(PurchasereceiptJobMainCreateReqVO createReqVO) { @@ -78,5 +84,33 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain public List getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO) { return purchasereceiptJobMainMapper.selectList(exportReqVO); } - + /** + * 调用校验供应商发货记录方法 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS); + } + } + @Override + public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectOne(queryWrapper); + if(purchasereceiptJobMainDO != null){ + return purchasereceiptJobMainDO; + }else { + throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index c92d9de0..4da1d26c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -70,5 +70,12 @@ public interface PurchasereturnJobMainService { * @return 采购退货任务主列表 */ List getPurchasereturnJobMainList(PurchasereturnJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 5377edd9..55339151 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -1,9 +1,13 @@ package com.win.module.wms.service.purchasereturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,7 +34,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe @Resource private PurchasereturnJobMainMapper purchasereturnJobMainMapper; - + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @Override public String createPurchasereturnJobMain(PurchasereturnJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +87,33 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe public List getPurchasereturnJobMainList(PurchasereturnJobMainExportReqVO exportReqVO) { return purchasereturnJobMainMapper.selectList(exportReqVO); } - + /** + * 调用校验供应商发货记录方法 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS); + } + } + @Override + public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PurchasereturnJobMainDO purchasereturnJobMainDO = purchasereturnJobMainMapper.selectOne(queryWrapper); + if(purchasereturnJobMainDO != null){ + return purchasereturnJobMainDO; + }else { + throw exception(PURCHASERETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index ab046a74..f6cd9213 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -70,5 +70,12 @@ public interface PutawayJobMainService { * @return 上架任务主列表 */ List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index a3c8959d..3de7cf41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.putawayJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { public List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO) { return putawayJobMainMapper.selectList(exportReqVO); } - + @Override + public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectOne(queryWrapper); + if(putawayJobMainDO != null){ + return putawayJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index 02ec7963..2e16a5f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -70,5 +70,12 @@ public interface RepleinshJobMainService { * @return 补料任务主列表 */ List getRepleinshJobMainList(RepleinshJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public RepleinshJobMainDO repleinshJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 81486897..4ce95608 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.repleinshJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { public List getRepleinshJobMainList(RepleinshJobMainExportReqVO exportReqVO) { return repleinshJobMainMapper.selectList(exportReqVO); } - + @Override + public RepleinshJobMainDO repleinshJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + RepleinshJobMainDO repleinshJobMainDO = repleinshJobMainMapper.selectOne(queryWrapper); + if(repleinshJobMainDO != null){ + return repleinshJobMainDO; + }else { + throw exception(REPLEINSH_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java index c175f999..b0a8b3a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.controller.sale.vo.SaleMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,13 @@ public interface SaleMainService { * @return 销售订单主列表 */ List getSaleMainList(SaleMainExportReqVO exportReqVO); - + /** + * 校验销售订单 + * + * @param psoNumber 单据号 + * @param psoLine 行号 + * @param pitemCode 物品代码 + * @return 销售订单子列表 + */ + public SaleDetailDO selectSaleDetailDoExist(String psoNumber, String psoLine, String pitemCode); } 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 16c4eb97..54800ac1 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,9 +1,12 @@ package com.win.module.wms.service.sale; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.controller.sale.vo.SaleMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.dal.mysql.sale.SaleDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,7 +33,8 @@ public class SaleMainServiceImpl implements SaleMainService { @Resource private SaleMainMapper saleMainMapper; - + @Resource + private SaleDetailMapper saleDetailMapper; @Override public Long createSaleMain(SaleMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +86,25 @@ public class SaleMainServiceImpl implements SaleMainService { public List getSaleMainList(SaleMainExportReqVO exportReqVO) { return saleMainMapper.selectList(exportReqVO); } - + @Override + public SaleDetailDO selectSaleDetailDoExist(String psoNumber,String psoLine,String pitemCode) { + QueryWrapper saleMainDOQueryWrapper = new QueryWrapper<>(); + saleMainDOQueryWrapper.eq("number",psoNumber); + SaleMainDO saleMainDO = saleMainMapper.selectOne(saleMainDOQueryWrapper); + if(saleMainDO != null && "TRUE".equals(saleMainDO.getAvailable())){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("master_id",saleMainDO.getId()); + queryWrapper.eq("item_code",pitemCode); + queryWrapper.eq("number",psoNumber); + queryWrapper.eq("line_number",psoLine); + SaleDetailDO saleDetailDO = saleDetailMapper.selectOne(queryWrapper); + if(saleDetailDO != null){ + return saleDetailDO; + }else { + throw exception(SALE_DETAIL_NUMBER_AND_LINE_NUMBER_AND_ITEMCODE_NOT_EXISTS); + } + }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/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 6346c143..9e81291f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -37,7 +37,7 @@ public class SalepriceServiceImpl implements SalepriceService { @Override public Long createSaleprice(SalepriceCreateReqVO createReqVO) { - validateSalepriceForCreateOrUpdate(createReqVO.getId(),createReqVO.getCustomercode(),createReqVO.getItemcode(),createReqVO.getCurrency() + validateSalepriceForCreateOrUpdate(createReqVO.getId(),createReqVO.getCustomerCode(),createReqVO.getItemCode(),createReqVO.getCurrency() ,createReqVO.getPrice(),createReqVO.getAvailable()); // 插入 SalepriceDO saleprice = SalepriceConvert.INSTANCE.convert(createReqVO); @@ -49,7 +49,7 @@ public class SalepriceServiceImpl implements SalepriceService { @Override public void updateSaleprice(SalepriceUpdateReqVO updateReqVO) { // 校验存在 - validateSalepriceForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCustomercode(),updateReqVO.getItemcode(),updateReqVO.getCurrency() + validateSalepriceForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCustomerCode(),updateReqVO.getItemCode(),updateReqVO.getCurrency() ,updateReqVO.getPrice(),updateReqVO.getAvailable()); // 更新 SalepriceDO updateObj = SalepriceConvert.INSTANCE.convert(updateReqVO); @@ -93,7 +93,7 @@ public class SalepriceServiceImpl implements SalepriceService { // 校验，判断是否有不符合的原因 try { if(mode != null){ - validateSalepriceForCreateOrUpdate(null,saleprice.getCustomercode(),saleprice.getItemcode(),saleprice.getCurrency() + validateSalepriceForCreateOrUpdate(null,saleprice.getCustomerCode(),saleprice.getItemCode(),saleprice.getCurrency() ,saleprice.getPrice(),saleprice.getAvailable()); } } catch (ServiceException ex) { @@ -102,7 +102,7 @@ public class SalepriceServiceImpl implements SalepriceService { } // 判断如果不存在，在进行插入 - SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemcode()); + SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); if (existSaleprice == null&& mode != 3) { salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index b61dea6d..987f53b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -70,5 +70,12 @@ public interface ScrapJobMainService { * @return 报废出库任务主列表 */ List getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ScrapJobMainDO scrapJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index c5426884..d1322de0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.scrapJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { public List getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO) { return scrapJobMainMapper.selectList(exportReqVO); } - + @Override + public ScrapJobMainDO scrapJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ScrapJobMainDO scrapJobMainDO = scrapJobMainMapper.selectOne(queryWrapper); + if(scrapJobMainDO != null){ + return scrapJobMainDO; + }else { + throw exception(SCRAP_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 056ccf26..3d92f034 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -70,5 +70,18 @@ public interface SupplierService { List getSupplierList(SupplierExportReqVO exportReqVO); List importSupplierList(List importTeam, Integer mode, boolean updatePart); - public SupplierDO supplierExist(String Supplier); + /** + * 查询供应商信息 + * + * @param code 代码 + * @return 供应商列表 + */ + public SupplierDO selectSupplier(String code); + /** + * 校验供应商有效，状态正确 + * + * @param supplierCode 代码 + * @return 供应商列表 + */ + public SupplierDO supplierExist(String supplierCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index 88ef1d76..4b43c67c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java @@ -171,7 +171,7 @@ public class SupplierServiceImpl implements SupplierService { throw exception(SUPPLIER_AVAILABLE_NOT_EXISTS); } } - + @Override public SupplierDO selectSupplier(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); @@ -182,16 +182,13 @@ public class SupplierServiceImpl implements SupplierService { throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } } - //物料有效，状态正确 - public SupplierDO supplierExist(String Supplier) { - SupplierDO supplierDO = selectSupplier(Supplier); + @Override + public SupplierDO supplierExist(String supplierCode) { + SupplierDO supplierDO = selectSupplier(supplierCode); if(supplierDO != null){ return supplierDO; }else { throw exception(STDCOSTPRICE_SUPPLIER_CODE_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 dd9c0965..f91bcfad 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 @@ -7,6 +7,7 @@ import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRec import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -71,4 +72,14 @@ public interface SupplierdeliverRecordMainService { */ List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO); + /** + * 校验供应商发货记录 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine); } 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 eeacd8ec..df36e7fc 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,9 +1,12 @@ package com.win.module.wms.service.supplierdeliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,6 +33,8 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco @Resource private SupplierdeliverRecordMainMapper supplierdeliverRecordMainMapper; + @Resource + private SupplierdeliverRecordDetailMapper supplierdeliverRecordDetailMapper; @Override public Long createSupplierdeliverRecordMain(SupplierdeliverRecordMainCreateReqVO createReqVO) { @@ -82,5 +87,25 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco public List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO) { return supplierdeliverRecordMainMapper.selectList(exportReqVO); } - + @Override + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("asn_number",pasnNumber); + SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper); + if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id",supplierdeliverRecordMainDO.getId()); + queryWrapper1.eq("item_code",pitemCode); + queryWrapper1.eq("po_number",ppoNumber); + queryWrapper1.eq("po_line",ppoLine); + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS); + } + }else { + throw exception(SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 5d923e94..dfb7cb3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -70,5 +70,12 @@ public interface TransferissueJobMainService { * @return 调拨出库任务主列表 */ List getTransferissueJobMainList(TransferissueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public TransferissueJobMainDO transferissueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 3629b348..7b01caf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.transferissueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ public List getTransferissueJobMainList(TransferissueJobMainExportReqVO exportReqVO) { return transferissueJobMainMapper.selectList(exportReqVO); } - + @Override + public TransferissueJobMainDO transferissueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + TransferissueJobMainDO transferissueJobMainDO = transferissueJobMainMapper.selectOne(queryWrapper); + if(transferissueJobMainDO != null){ + return transferissueJobMainDO; + }else { + throw exception(TRANSFERISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index 727823ed..773308c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface TransferreceiptJobMainService { * @return 调拨入库任务主列表 */ List getTransferreceiptJobMainList(TransferreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public TransferreceiptJobMainDO transferreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index e78e4d50..653e39a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.transferreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain public List getTransferreceiptJobMainList(TransferreceiptJobMainExportReqVO exportReqVO) { return transferreceiptJobMainMapper.selectList(exportReqVO); } - + @Override + public TransferreceiptJobMainDO transferreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + TransferreceiptJobMainDO transferreceiptJobMainDO = transferreceiptJobMainMapper.selectOne(queryWrapper); + if(transferreceiptJobMainDO != null){ + return transferreceiptJobMainDO; + }else { + throw exception(TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index b086914e..984878d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -70,5 +70,12 @@ public interface UnplannedissueJobMainService { * @return 计划外出库任务主列表 */ List getUnplannedissueJobMainList(UnplannedissueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public UnplannedissueJobMainDO unplannedissueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 901a1a46..7ced0576 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.unplannedissueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe public List getUnplannedissueJobMainList(UnplannedissueJobMainExportReqVO exportReqVO) { return unplannedissueJobMainMapper.selectList(exportReqVO); } - + @Override + public UnplannedissueJobMainDO unplannedissueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + UnplannedissueJobMainDO unplannedissueJobMainDO = unplannedissueJobMainMapper.selectOne(queryWrapper); + if(unplannedissueJobMainDO != null){ + return unplannedissueJobMainDO; + }else { + throw exception(UNPLANNEDISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java index ea1575c7..2d09a578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; @@ -70,5 +71,13 @@ public interface UnplannedissueRequestMainService { * @return 计划外出库申请主列表 */ List getUnplannedissueRequestMainList(UnplannedissueRequestMainExportReqVO exportReqVO); + /** + * 获取字典数据(原因是否有效) + * + * @param ptype 字典类型 + * @param plabel 字典标签 + * @return 字典数据信息 + */ + public DictDataRespDTO selectLabelExist(String ptype, String plabel); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index b4246a76..497a4fb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -1,5 +1,7 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.module.system.api.dict.DictDataApi; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; @@ -30,7 +32,8 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque @Resource private UnplannedissueRequestMainMapper unplannedissueRequestMainMapper; - + @Resource + private DictDataApi dictDataApi; @Override public Long createUnplannedissueRequestMain(UnplannedissueRequestMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +85,10 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque public List getUnplannedissueRequestMainList(UnplannedissueRequestMainExportReqVO exportReqVO) { return unplannedissueRequestMainMapper.selectList(exportReqVO); } - + @Override + public DictDataRespDTO selectLabelExist(String ptype, String plabel){ + ptype = "unplanned_issue_reason"; + DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictTypeAndLabel(ptype, plabel); + return dictDataRespDTO; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index 4203913d..e02a5622 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface UnplannedreceiptJobMainService { * @return 计划外入库任务主列表 */ List getUnplannedreceiptJobMainList(UnplannedreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public UnplannedreceiptJobMainDO unplannedreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 1e383daf..15cbf16b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.unplannedreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa public List getUnplannedreceiptJobMainList(UnplannedreceiptJobMainExportReqVO exportReqVO) { return unplannedreceiptJobMainMapper.selectList(exportReqVO); } - + @Override + public UnplannedreceiptJobMainDO unplannedreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + UnplannedreceiptJobMainDO unplannedreceiptJobMainDO = unplannedreceiptJobMainMapper.selectOne(queryWrapper); + if(unplannedreceiptJobMainDO != null){ + return unplannedreceiptJobMainDO; + }else { + throw exception(UNPLANNEDRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 98bb73d6..980a5da7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -73,7 +73,12 @@ public interface WarehouseService { List importWarehouseList(List warehouses, Integer mode, boolean updatePart); - //仓库有效，状态正确 - public WarehouseDO WarehouseExist(String code); + /** + * 校验仓库有效，状态正确 + * + * @param code 代码 + * @return 仓库列表 + */ + WarehouseDO WarehouseExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index 0b460925..b070a7c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java @@ -167,7 +167,7 @@ public class WarehouseServiceImpl implements WarehouseService { throw exception(WAREHOUSE_AVAIABLE_NOT_EXISTS); } } - //仓库有效，状态正确 + @Override public WarehouseDO WarehouseExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code);