BUG修改

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<PurchaseDetailDO> pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO);
         return success(PurchaseDetailConvert.INSTANCE.convertPage(pageResult));
     }
+
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得采购订单子信息分页")
     @PreAuthorize("@ss.hasPermission('wms:purchase-detail:query')")

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<List<SupplierinvoiceRequestMainDO>> getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) {
+    public CommonResult<Object> getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) {
-        List<SupplierinvoiceRequestMainDO> supplierinvoiceRequestMainDOList = supplierinvoiceRequestMainService.getNumber(pageVO);
+        Object object = supplierinvoiceRequestMainService.getNumber(pageVO);
-        return success(supplierinvoiceRequestMainDOList) ;
+        return success(object) ;
     }
 
 }

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<PurchaseDetailDO> {
                 .eqIfPresent(PurchaseDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
                 .eqIfPresent(PurchaseDetailDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(PurchaseDetailDO::getId));
+                .orderByAsc(PurchaseDetailDO::getLineNumber));
     }
     default PageResult<PurchaseDetailDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));

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<PurchasePlanDetail
                 .betweenIfPresent(PurchasePlanDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(PurchasePlanDetailDO::getUpdater, reqVO.getUpdater())
                 .eqIfPresent(PurchasePlanDetailDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(PurchasePlanDetailDO::getId));
+                .orderByAsc(PurchasePlanDetailDO::getPoLine));
     }
     default PageResult<PurchasePlanDetailDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));

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<Purchaseclaim
                 .orderByDesc(PurchaseclaimRecordMainDO::getId));
     }
 
+    default PageResult<PurchaseclaimRecordMainDO> selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PurchaseclaimRecordMainDO>()
+                .eq(PurchaseclaimRecordMainDO::getSupplierCode, reqVO.getSupplierCode()));
+    }
+
 }

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<Purchaserec
         return selectList(QueryWrapperUtils.structure(conditions));
     }
 
+    default PageResult<PurchasereceiptRecordMainDO> selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptRecordMainDO>()
+                .eq(PurchasereceiptRecordMainDO::getSupplierCode, reqVO.getSupplierCode()));
+    }
+
 }

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<Purchaseretu
         return selectList(QueryWrapperUtils.structure(conditions));
     }
 
+    default PageResult<PurchasereturnRecordMainDO> selectNumber(SupplierinvoiceRequestMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnRecordMainDO>()
+                .eq(PurchasereturnRecordMainDO::getSupplierCode, reqVO.getSupplierCode()));
+    }
+
 }

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<PurchasePlanDetailDO> 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);
     }

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<SupplierinvoiceRequestMainDO> getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO);
+    Object getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO);
 
 }

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<SupplierinvoiceRequestMainDO> getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) {
+    public Object getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) {
-        List<SupplierinvoiceRequestMainDO> supplierinvoiceRequestMainDOList=new ArrayList<>();
+        Object object=new ArrayList<>();
         // 收货单号 purchasereceiptRecordMainMapper
         if ("1".equals(pageReqVO.getRecordType())) {
-            QueryWrapper<PurchasereceiptRecordMainDO> purchasereceiptRecordMainDOQueryWrapper = new QueryWrapper<>();
+            object = purchasereceiptRecordMainMapper.selectNumber(pageReqVO);
-            purchasereceiptRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
-            List<PurchasereceiptRecordMainDO> purchasereceiptRecordMainDOList = purchasereceiptRecordMainMapper.selectList(purchasereceiptRecordMainDOQueryWrapper);
-            for (PurchasereceiptRecordMainDO purchasereceiptRecordMainDO : purchasereceiptRecordMainDOList) {
-                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
-                BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO);
-                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
-            }
         }
         // 退货单号 purchasereturnRecordMainMapper
         else if ("2".equals(pageReqVO.getRecordType())) {
-            QueryWrapper<PurchasereturnRecordMainDO> purchasereturnRecordMainDOQueryWrapper = new QueryWrapper<>();
+            object = purchasereturnRecordMainMapper.selectNumber(pageReqVO);
-            purchasereturnRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
-            List<PurchasereturnRecordMainDO> purchasereturnRecordMainDOList = purchasereturnRecordMainMapper.selectList(purchasereturnRecordMainDOQueryWrapper);
-            for (PurchasereturnRecordMainDO purchasereceiptRecordMainDO : purchasereturnRecordMainDOList) {
-                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
-                BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO);
-                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
-            }
         }
         // 索赔单号 purchaseclaimRecordMainMapper
         else if ("3".equals(pageReqVO.getRecordType())) {
-            QueryWrapper<PurchaseclaimRecordMainDO> purchaseclaimRecordMainDOQueryWrapper = new QueryWrapper<>();
+            object = purchaseclaimRecordMainMapper.selectNumber(pageReqVO);
-            purchaseclaimRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
-            List<PurchaseclaimRecordMainDO> purchasereturnRecordMainDOList = purchaseclaimRecordMainMapper.selectList(purchaseclaimRecordMainDOQueryWrapper);
-            for (PurchaseclaimRecordMainDO purchaseclaimRecordMainDO : purchasereturnRecordMainDOList) {
-                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
-                BeanUtils.copyProperties(purchaseclaimRecordMainDO, supplierinvoiceRequestMainDO);
-                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
         }
-        }
+
-        return supplierinvoiceRequestMainDOList;
+        return object;
     }