销售订单-采购订单分页列表

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java

@@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyDetailFeign.java <br/>
@@ -57,4 +55,8 @@ public interface BusVehicleApplyDetailFeign {
     @ApiOperation("查询车型sid")
     @GetMapping("/selModel/{sid}")
     public ResultBean<BusVehicleApplyDetailVo> selModel(@PathVariable("sid") String sid);
+
+    @ApiOperation("销售订单-采购订单分页列表")
+    @PostMapping("/applyPage")
+    ResultBean<PagerVo<BusVehicleApplyListVo>> applyPage(@RequestBody PagerQuery<BusVehicleApplyListQuery> pagerQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java

@@ -5,8 +5,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyDetailFeignFallback.java <br/>
@@ -53,4 +51,9 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail
 	public ResultBean<BusVehicleApplyDetailVo> selModel(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<BusVehicleApplyListVo>> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.busvehicleapplydetail;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/1 14:17
+ * @Description
+ */
+@Data
+public class BusVehicleApplyListQuery implements Query {
+    private static final long serialVersionUID = 1760135747503673918L;
+
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+    @ApiModelProperty(value = "已选")
+    private List<String> sidList;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.busvehicleapplydetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/1 14:10
+ * @Description
+ */
+@Data
+public class BusVehicleApplyListVo implements Vo {
+    private static final long serialVersionUID = -3443220506000955719L;
+    @ApiModelProperty("采购订单编号")
+    private String linkNo;
+    @ApiModelProperty("采购订单日期")
+    private String linkText;
+    @ApiModelProperty("采购订单sid")
+    private String linkSid;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java

@@ -1,11 +1,14 @@
 package com.yxt.anrui.base.biz.busvehicleapplydetail;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,4 +49,12 @@ public interface BusVehicleApplyDetailMapper extends BaseMapper<BusVehicleApplyD
 
 	@Select("select * from bus_vehicle_apply_detail where applySid = #{sid}")
 	List<BusVehicleApplyDetailVo> fetchByApplySid(String sid);
+
+	/**
+	 * 销售订单-采购订单分页列表
+	 * @param page 分页
+	 * @param qw 查询条件
+	 * @return
+	 */
+    IPage<BusVehicleApplyListVo> applyPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER)QueryWrapper<BusVehicleApply> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@@ -24,4 +24,11 @@
         from bus_vehicle_apply_detail
         where vehicleSid = #{sid}
     </select>
+
+    <select id="applyPage" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo">
+        select bo.sid linkSid,bo.orderNo linkNo,bo.orderDate linkText,bo.platformNo,bo.lockingNum from bus_vehicle_apply_detail bd
+        left join bus_vehicle_apply bv on bd.applySid = bv.sid
+        left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java

@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyDetailFeignFallback.java <br/>
@@ -81,5 +79,12 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
         return new ResultBean<BusVehicleApplyDetailVo>().success().setData(vo);
     }
 
+    @Override
+    public ResultBean<PagerVo<BusVehicleApplyListVo>> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
+        ResultBean<PagerVo<BusVehicleApplyListVo>> rb = ResultBean.fireFail();
+        PagerVo<BusVehicleApplyListVo> pv = busVehicleApplyDetailService.applyPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -3,13 +3,8 @@ package com.yxt.anrui.base.biz.busvehicleapplydetail;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
+import com.yxt.anrui.base.api.busvehicleapplydetail.*;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailQuery;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
-import com.yxt.anrui.base.api.busvehicleorder.AppCommonlyUsedModelsByPageListQuery;
-import com.yxt.anrui.base.api.busvehicleorder.AppProductionSchedulingByPageQuery;
-import com.yxt.anrui.base.api.busvehicleorder.AppProductionSchedulingByPageVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -81,7 +76,7 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 		}
 		return qw;
 	}
-	
+
 	public PagerVo<BusVehicleApplyDetailVo> listPageVo(PagerQuery<BusVehicleApplyDetailQuery> pq) {
 		BusVehicleApplyDetailQuery query = pq.getParams();
 		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
@@ -90,22 +85,22 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 		PagerVo<BusVehicleApplyDetailVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public List<BusVehicleApplyDetailVo> listAllVo(BusVehicleApplyDetailQuery query) {
 		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
 		return baseMapper.selectListAllVo(qw);
 	}
-	
+
 	public List<BusVehicleApplyDetailVo> listVo() {
 		return baseMapper.selectListVo();
 	}
-	
+
 	public void saveOrUpdateDto(BusVehicleApplyDetailDto dto){
 		BusVehicleApplyDetail entity = new BusVehicleApplyDetail();
 		dto.fillEntity(entity);
 		this.saveOrUpdate(entity);
 	}
-	
+
 	public BusVehicleApplyDetailVo fetchByIdVo(String id){
 		BusVehicleApplyDetail entity = this.fetchById(id);
 		BusVehicleApplyDetailVo vo = new BusVehicleApplyDetailVo();
@@ -124,4 +119,37 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 	public BusVehicleApplyDetailVo selModel(String sid) {
 		return baseMapper.selModel(sid);
 	}
+
+	/**
+	 * 销售订单-采购订单分页列表
+	 * @param pagerQuery 查询条件
+	 * @return
+	 */
+	public PagerVo<BusVehicleApplyListVo> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
+		BusVehicleApplyListQuery query = pagerQuery.getParams();
+		QueryWrapper<BusVehicleApply> qw = applyPageWrapper(query);
+		IPage<BusVehicleApply> page = PagerUtil.queryToPage(pagerQuery);
+		IPage<BusVehicleApplyListVo> pagging = baseMapper.applyPage(page, qw);
+		PagerVo<BusVehicleApplyListVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+
+	/**
+	 * 销售订单-采购订单分页列表构造条件
+	 * @param query
+	 * @return
+	 */
+    private QueryWrapper<BusVehicleApply> applyPageWrapper(BusVehicleApplyListQuery query) {
+        QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
+		if (query != null) {
+			//车型sid
+			qw.eq("bd.modelSid", query.getModelSid());
+			//配置sid
+			qw.eq("bd.modelConfigSid", query.getConfigSid());
+			if (query.getSidList().size() > 0) {
+				qw.notIn("bo.sid", query.getSidList());
+			}
+		}
+        return qw;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -28,16 +28,18 @@ package com.yxt.anrui.base.biz.busvehicleorder;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
+import com.yxt.anrui.base.api.busvehicleorder.pc.PcBaseOrderQuery;
+import com.yxt.anrui.base.api.busvehicleorder.pc.PcBaseOrderVo;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -126,6 +128,11 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<PagerVo<PcBaseOrderVo>> selectVo(PagerQuery<PcBaseOrderQuery> pcBaseVehicleOrderQuery) {
+        return null;
+    }
+
     /**
      * 手机端排产车分页列表
      *

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java

@@ -59,7 +59,7 @@ public class BusDeliveredApplyDetailsVo implements Vo {
     @ApiModelProperty(value = "使用人信息sid")
     private String useMessageSid;
     @ApiModelProperty(value = "使用人信息")
-    private BusDeliveredUseMessageVo useMessage = new BusDeliveredUseMessageVo();
+    private BusDeliveredUseMessageVo useMessage;
     @ApiModelProperty(value = "备注")
     private String remarks;