问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -146,6 +146,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getCarModelName())) {
             qw.like("btm.carModelName", query.getCarModelName());
         }
+        qw.orderByDesc("bt.createTime");
         String warehousingStartDate = query.getWarehousingStartDate();
         String warehousingEndDate = query.getWarehousingEndDate();
         qw.apply(StringUtils.isNotEmpty(warehousingStartDate), "date_format (bt.warehousingDate,'%Y-%m-%d') >= date_format('" + warehousingStartDate + "','%Y-%m-%d')").

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2757,6 +2757,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getVehMark())) {
             baseVehicle.setVehMark(dto.getVehMark());
         }
+        if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
+            baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
+        }
     }
 
     public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@@ -2925,6 +2928,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getVehMark())) {
             baseVehicle.setVehMark(dto.getVehMark());
         }
+        if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
+            baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
+        }
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -17,8 +17,8 @@
 		bv.vehModel,
 		bv.vinNo,
 		bv.vehicleStateValue,
-		bv.priceDate,
-		bv.salesDate,
+		bvm.priceDate,
+		bvm.salesDate,
 		bv.costPrice,
 		bv.guidePrice,
 		bv.vehModelSid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -28,10 +28,12 @@ package com.yxt.anrui.base.biz.basevehinstall;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
@@ -81,6 +83,8 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
 
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
@@ -120,25 +124,19 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
             StkInStock stkInStock = new StkInStock();
             //入库日期:FDate  (必填项)
             stkInStock.setFDate(DateUtil.formatDate(new Date()));
+            //获取主车信息
+            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, dto.getCreateOrg());
+            //获取主车采购系统sid
+            String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
+            //根据采购系统sid获取部门组织信息
+            SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
             //采购部门:FPurchaseDeptId  (必填项)
-			String departmentSid = dto.getDepartmentSid();
-			SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
-			stkInStock.setFPurchaseDeptId(data.getOrgCode());
+            stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode());
             //采购组织:FPurchaseOrgId  (必填项)
-			BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData();
-			if (basePurchaseSystemDetailsVo != null){
+            BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
             stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
             //分配目标组织:TOrgId  (必填项)
             stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());
-			}else {
-				ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
-				SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
-				if (vo != null) {
-					stkInStock.setFPurchaseOrgId(vo.getOrgCode());
-					//分配目标组织:TOrgId  (必填项)
-					stkInStock.setTOrgId(vo.getOrgCode());
-				}
-			}
             //供应商:FSupplierId  (必填项)
             String mainSid = dto.getMainSid();
             BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -112,6 +112,7 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 		if (StringUtils.isNotBlank(query.getVinNo())){
 			qw.like("bv.vinNo",query.getVinNo());
 		}
+		qw.orderByDesc("bvm.createTime");
 		IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
 		IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);