From 04fcdda604e22b77cf76a6391223de6214e34c7f Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 31 Oct 2023 08:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 5 ++-- .../vo/DeliverRecordDetailBaseVO.java | 2 ++ .../ProductreceiptJobMainController.java | 3 --- .../BackflushRecordDetailbController.java | 3 --- .../ProductreceiptRecordDetailController.java | 3 --- .../ProductreceiptRecordMainController.java | 3 --- ...ProductreceiptRequestDetailController.java | 3 --- .../ProductreceiptRequestMainController.java | 3 --- .../ProductrepairRecordDetailController.java | 3 --- .../ProductrepairRequestMainController.java | 3 --- .../deliverRecord/DeliverRecordDetailDO.java | 10 ++++---- .../DeliverRecordMainService.java | 12 +++++++++ .../DeliverRecordMainServiceImpl.java | 25 +++++++++++++++++++ .../wms/service/shift/ShiftService.java | 8 ++++++ .../wms/service/shift/ShiftServiceImpl.java | 13 ++++++++++ .../module/wms/service/team/TeamService.java | 7 ++++++ .../wms/service/team/TeamServiceImpl.java | 13 ++++++++++ 17 files changed, 88 insertions(+), 31 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index ad3ae892..7d285dc4 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 @@ -675,8 +675,9 @@ public interface ErrorCodeConstants { 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, "发货记录子不存在"); + ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在"); + ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在"); + ErrorCode DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS = new ErrorCode(1_000_121_002, "采购收货记录明细：销售订单号或销售订单行或物品代码无效"); //客户收货申请ErrorCode ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在"); ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java index 31b56a5b..034f71b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java @@ -116,4 +116,6 @@ public class DeliverRecordDetailBaseVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "是否可用") + private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 31ecfd03..658c7c85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptJobMainRespVO; import com.win.module.wms.controller.productreceiptJob.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptJobMainConvert; import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptJobMainDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java index a4e81f0d..31bc1d83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.BackflushRecordDetailbRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.BackflushRecordDetailbConvert; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.BackflushRecordDetailbDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java index 2336f159..af3b211b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRecordDetailRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordDetailConvert; import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java index ae9198d6..45ba617b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRecordMainRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordMainConvert; import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordMainDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java index 52b4b01e..0d7aae13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRequestDetailRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestDetailConvert; import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java index a7a93dec..aa9cc3ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRequestMainRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestMainConvert; import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestMainDO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java index 04879ca3..a384dbd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductrepairRecordDetailRespVO; import com.win.module.wms.controller.productrepairRecord.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductrepairRecordDetailConvert; import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRecordDetailDO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java index 8f4d1461..58c53c20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java @@ -7,11 +7,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.ProductrepairRequestMainRespVO; import com.win.module.wms.controller.productrepairRequest.vo.*; -import com.win.module.wms.convert.accountcalendar.ProductrepairRequestMainConvert; import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRequestMainDO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; import io.swagger.v3.oas.annotations.Operation; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java index dc9b692a..f5b945ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java @@ -1,10 +1,7 @@ package com.win.module.wms.dal.dataobject.deliverRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; @@ -158,5 +155,8 @@ public class DeliverRecordDetailDO extends BaseDO { * 任务明细ID */ private String jobDetailId; - + /** + * 是否可用 + */ + private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java index b44dc77b..a933a95b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java @@ -8,6 +8,7 @@ import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReq import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -48,6 +49,17 @@ public interface DeliverRecordMainService { */ DeliverRecordMainDO getDeliverRecordMain(Long id); + /** + * Record-----VPD + * 校验成品发货记录 + * author chenfang + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @param psoNumber 销售订单号 + * @param psoLine 销售订单行 + * @return + */ + DeliverRecordDetailDO selectDeliverRecordExist(String pnumber, String pitemCode, String psoNumber, String psoLine); /** * 获得发货记录主列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index 5aa31c35..1c4d876e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -1,10 +1,13 @@ package com.win.module.wms.service.deliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; +import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +35,9 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { @Resource private DeliverRecordMainMapper deliverRecordMainMapper; + @Resource + private DeliverRecordDetailMapper deliverRecordDetailMapper; + @Override public Long createDeliverRecordMain(DeliverRecordMainCreateReqVO createReqVO) { // 插入 @@ -69,6 +75,25 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { return deliverRecordMainMapper.selectById(id); } + @Override + public DeliverRecordDetailDO selectDeliverRecordExist(String pnumber,String pitemCode,String psoNumber,String psoLine){ + QueryWrapper queryWrapperMain = new QueryWrapper(); + queryWrapperMain.eq("number",pnumber); + DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapperMain); + if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO)){ + QueryWrapper queryWrapperDetail = new QueryWrapper(); + queryWrapperDetail.eq("itemcode",pitemCode); + queryWrapperDetail.eq("so_number",psoNumber); + queryWrapperDetail.eq("so_line",psoLine); + DeliverRecordDetailDO deliverRecordDetailDO = deliverRecordDetailMapper.selectOne(queryWrapperDetail); + if(deliverRecordDetailDO != null && "TRUE".equals(deliverRecordDetailDO.getAvailable())){ + return deliverRecordDetailDO; + }else { + throw exception(DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS); + } + } + return null; + } @Override public List getDeliverRecordMainList(Collection ids) { return deliverRecordMainMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java index 9311496c..4136cbb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java @@ -52,6 +52,14 @@ public interface ShiftService { */ ShiftDO getShift(Long id); + /** + * BQ---QS + * 查询班次是否有效 + * @author chenfang + * @param pcode 班组code + * @return 班次 + */ + ShiftDO selectShiftExist(String pcode); /** * 获得班次列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java index cd816753..e8edb752 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.shift; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; @@ -70,6 +71,18 @@ public class ShiftServiceImpl implements ShiftService { return shiftMapper.selectById(id); } + @Override + public ShiftDO selectShiftExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + ShiftDO shiftDO = shiftMapper.selectOne(queryWrapper); + if(shiftDO != null && "TRUE".equals(shiftDO.getAvailable())){ + return shiftDO; + }else { + return null; + } + } + @Override public List getShiftList(Collection ids) { return shiftMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java index 6c6e7ecf..3c217fc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java @@ -57,6 +57,13 @@ public interface TeamService { */ TeamDO getTeam(Long id); + /** + * BQ---QT + * 查询班组 + * @param pcode + * @return + */ + TeamDO selectTeamExist(String pcode); /** * 获得班组列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java index 6005192a..0ebaaa9a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.team; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; @@ -72,6 +73,18 @@ public class TeamServiceImpl implements TeamService { return teamMapper.selectById(id); } + @Override + public TeamDO selectTeamExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + TeamDO teamDO = teamMapper.selectOne(queryWrapper); + if(teamDO != null && "TRUE".equals(teamDO.getAvailable())){ + return teamDO; + }else { + return null; + } + } + @Override public List getTeamList(Collection ids) { return teamMapper.selectBatchIds(ids);