diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java index ebb4bf32..cb017ea9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java @@ -41,8 +41,6 @@ public class PurchaseDetailController { private PurchaseDetailService purchaseDetailService; @Resource private PurchaseDetailMapper purchaseDetailMapper; - - @Resource private AdminUserApi userApi; @@ -95,6 +93,7 @@ public class PurchaseDetailController { PageResult pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO); return success(PurchaseDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得采购订单子信息分页") @PreAuthorize("@ss.hasPermission('wms:purchase-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java index e03b8182..805ecc9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java @@ -126,9 +126,9 @@ public class SupplierinvoiceRequestMainController { @GetMapping("/getNumber") @Operation(summary = "获得供应商发票子单据号分页") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:getNumber')") - public CommonResult> getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) { - List supplierinvoiceRequestMainDOList = supplierinvoiceRequestMainService.getNumber(pageVO); - return success(supplierinvoiceRequestMainDOList) ; + public CommonResult getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) { + Object object = supplierinvoiceRequestMainService.getNumber(pageVO); + return success(object) ; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java index 9ece8273..8a63a941 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java @@ -51,7 +51,7 @@ public interface PurchaseDetailMapper extends BaseMapperX { .eqIfPresent(PurchaseDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp()) .eqIfPresent(PurchaseDetailDO::getStatus, reqVO.getStatus()) .eqIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable()) - .orderByDesc(PurchaseDetailDO::getId)); + .orderByAsc(PurchaseDetailDO::getLineNumber)); } default PageResult selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java index 9d089bcd..033fd45d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java @@ -38,7 +38,7 @@ public interface PurchasePlanDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java index ef35bb7a..dc095441 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java @@ -9,7 +9,10 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; +import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; +import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordMainDO; +import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; import org.apache.ibatis.annotations.Mapper; /** @@ -70,4 +73,9 @@ public interface PurchaseclaimRecordMainMapper extends BaseMapperX selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(PurchaseclaimRecordMainDO::getSupplierCode, reqVO.getSupplierCode())); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java index 42b4625d..ee6c10f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java @@ -7,7 +7,11 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; +import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; +import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; +import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; +import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -94,4 +98,9 @@ public interface PurchasereceiptRecordMainMapper extends BaseMapperX selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(PurchasereceiptRecordMainDO::getSupplierCode, reqVO.getSupplierCode())); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java index e45434b6..d71f3274 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java @@ -5,8 +5,11 @@ import com.win.framework.common.pojo.PageResult; 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.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; +import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; import org.apache.ibatis.annotations.Mapper; @@ -96,4 +99,9 @@ public interface PurchasereturnRecordMainMapper extends BaseMapperX selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(PurchasereturnRecordMainDO::getSupplierCode, reqVO.getSupplierCode())); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index a2b415d2..4b13a7c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -181,7 +181,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { if (!PurchasePlanStatusEnum.CLOSED.getCode().equals(purchasePlanMainDO.getStatus())) { QueryWrapper queryWrapperDetail = new QueryWrapper<>(); queryWrapperDetail.eq("master_id", purchasePlanMainDO.getId()); - queryWrapperDetail.eq("po_number", ppoNumber); + queryWrapperDetail.eq("number", ppoNumber); queryWrapperDetail.eq("po_line", ppoLine); queryWrapperDetail.eq("item_code", pitemCode); PurchasePlanDetailDO purchasePlanDetailDO = purchasePlanDetailMapper.selectOne(queryWrapperDetail); @@ -478,7 +478,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { @Transactional public Integer rejPurchasePlanMain(Long id) { PurchasePlanMainDO mainDO = validatePurchasePlanMainExists(id); - mainDO.setStatus(PlanStatusEnum.REFUSED.getCode());//增加操作记录 + mainDO.setStatus(PurchasePlanStatusEnum.REJECTED.getCode());//增加操作记录 trendsApi.createTrends(id, "plan_purchase_main", "驳回了要货计划申请", TrendsTypeEnum.UPDATE); return purchasePlanMainMapper.updateById(mainDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java index 1924ea36..d0c8cab5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java @@ -85,6 +85,6 @@ public interface SupplierinvoiceRequestMainService { * @param pageReqVO 分页查询 * @return 供应商发票申请主分页 */ - List getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO); + Object getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java index 446a8383..c8ade03d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java @@ -128,42 +128,22 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq @Override - public List getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) { - List supplierinvoiceRequestMainDOList=new ArrayList<>(); + public Object getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) { + Object object=new ArrayList<>(); // 收货单号 purchasereceiptRecordMainMapper if ("1".equals(pageReqVO.getRecordType())) { - QueryWrapper purchasereceiptRecordMainDOQueryWrapper = new QueryWrapper<>(); - purchasereceiptRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); - List purchasereceiptRecordMainDOList = purchasereceiptRecordMainMapper.selectList(purchasereceiptRecordMainDOQueryWrapper); - for (PurchasereceiptRecordMainDO purchasereceiptRecordMainDO : purchasereceiptRecordMainDOList) { - SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); - BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO); - supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); - } + object = purchasereceiptRecordMainMapper.selectNumber(pageReqVO); } // 退货单号 purchasereturnRecordMainMapper else if ("2".equals(pageReqVO.getRecordType())) { - QueryWrapper purchasereturnRecordMainDOQueryWrapper = new QueryWrapper<>(); - purchasereturnRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); - List purchasereturnRecordMainDOList = purchasereturnRecordMainMapper.selectList(purchasereturnRecordMainDOQueryWrapper); - for (PurchasereturnRecordMainDO purchasereceiptRecordMainDO : purchasereturnRecordMainDOList) { - SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); - BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO); - supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); - } + object = purchasereturnRecordMainMapper.selectNumber(pageReqVO); } // 索赔单号 purchaseclaimRecordMainMapper else if ("3".equals(pageReqVO.getRecordType())) { - QueryWrapper purchaseclaimRecordMainDOQueryWrapper = new QueryWrapper<>(); - purchaseclaimRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); - List purchasereturnRecordMainDOList = purchaseclaimRecordMainMapper.selectList(purchaseclaimRecordMainDOQueryWrapper); - for (PurchaseclaimRecordMainDO purchaseclaimRecordMainDO : purchasereturnRecordMainDOList) { - SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); - BeanUtils.copyProperties(purchaseclaimRecordMainDO, supplierinvoiceRequestMainDO); - supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); - } + object = purchaseclaimRecordMainMapper.selectNumber(pageReqVO); } - return supplierinvoiceRequestMainDOList; + + return object; }