diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java index 75d66e29..7e2fc630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java @@ -118,19 +118,4 @@ public class ProductrepairRequestDetailbController { } ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas); } - - @PostMapping("/senior") - @Operation(summary = "高级搜索获得制品返修申请子分页") - @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") - public CommonResult> getProductrepairRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { - PageResult pageResult = productrepairRequestDetailbService.getProductrepairRequestDetailbSenior(conditions); - PageResult result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult); - for(ProductrepairRequestDetailbRespVO vo : result.getList()) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - return success(result); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java index 9ae90860..3db6ef9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.purchasereturnJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -91,11 +91,9 @@ public class PurchasereturnJobDetailBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; - @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建者Id不能为空") - private Long creator; + @Schema(description = "创建者id") + private String creator; @Schema(description = "到货主代码") private String toOwnerCode; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java index f11ebd52..3fadae89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java @@ -8,6 +8,4 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchasereturnJobDetailRespVO extends PurchasereturnJobDetailBaseVO { - @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java index 83efa645..fbf351bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.repleinshRequest; -import java.util.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 补料申请主 Mapper * @@ -45,6 +47,10 @@ public interface RepleinshRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(RepleinshRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRequestMainDO::getFomWarehouseCode, reqVO.getFomWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java index ad3d10e2..670ad7e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.transferreceiptRequest; -import java.util.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 调拨入库申请子 Mapper * @@ -43,6 +45,10 @@ public interface TransferreceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(TransferreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) 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 c67c9ef4..dd566464 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 @@ -8,7 +8,6 @@ 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.convert.production.ProductionMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; @@ -119,7 +118,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } @Override - public PageResult getProductionMainSenior(CustomConditions conditions) { + public PageResult getProductionMainSenior(CustomConditions conditions) { return productionMainMapper.selectSenior(conditions); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java index fbfab4fe..e29e14a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainUpdateReqVO; +import com.win.module.wms.convert.repleinshRequest.RepleinshRequestMainConvert; +import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestMainDO; +import com.win.module.wms.dal.mysql.repleinshRequest.RepleinshRequestMainMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.repleinshRequest.RepleinshRequestMainConvert; -import com.win.module.wms.dal.mysql.repleinshRequest.RepleinshRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.REPLEINSH_REQUEST_MAIN_NOT_EXISTS; /** * 补料申请主 Service 实现类 @@ -40,6 +40,11 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ return repleinshRequestMain.getId(); } + @Override + public PageResult getRepleinshRequestMainSenior(CustomConditions conditions) { + return repleinshRequestMainMapper.selectSenior(conditions); + } + @Override public void updateRepleinshRequestMain(RepleinshRequestMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java index 1b45056f..18d8586a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailUpdateReqVO; +import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO; +import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestDetailMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestDetailConvert; -import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_REQUEST_DETAIL_NOT_EXISTS; /** * 调拨入库申请子 Service 实现类 @@ -49,6 +49,11 @@ public class TransferreceiptRequestDetailServiceImpl implements TransferreceiptR transferreceiptRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getTransferreceiptRequestDetailSenior(CustomConditions conditions) { + return transferreceiptRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteTransferreceiptRequestDetail(Long id) { // 校验存在