Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -52,8 +52,6 @@ import java.math.BigDecimal;
 public class BaseOutsourcingApplication extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("外采申请单sid")
-    private String sid; // 外采申请单sid
     @ApiModelProperty(value = "车辆型号")
     private String vehMark;
 	@ApiModelProperty("申请编号")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basetrailer;
 
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -111,4 +112,9 @@ public interface BaseTrailerFeign {
     @ApiOperation("挂车检索分页列表")
     @PostMapping("/searchPage")
     ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(@RequestBody PagerQuery<BaseTrailerSearchQuery> pagerQuery);
+
+    @ApiOperation("挂车出库")
+    @PostMapping("/trailerOut")
+    @ResponseBody
+    public ResultBean trailerOut(@RequestBody BaseTrailerDto dto);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -257,6 +257,13 @@ public interface BaseVehicleFeign {
     @PostMapping("/selExistingCar")
     public ResultBean<List<BaseExistingCarListVo>> selExistingCar(@RequestParam("createOrgSid") String createOrgSid);
 
+    /**
+     * 按照库存状态获取车辆信息
+     */
+    @ApiOperation("按照库存状态获取车辆信息")
+    @PostMapping("/selVehByStockState")
+    public ResultBean<List<BaseExistingCarListVo>> selVehByStockState(@RequestParam("createOrgSid") String createOrgSid);
+
     /**
      * pc排产车详情（新）
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -147,6 +147,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseExistingCarListVo>> selVehByStockState(String createOrgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.base.biz.baseoutsourcingapplication;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -184,10 +185,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();
             orgPath = sysStaffOrg.getOrgSidPath();
         }
-        BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
         List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos();
         CommonAppendix contract = dto.getContract();
-        String sid1 = entity.getSid();
         String sid = dto.getSid();
         BigDecimal guidedPrice = dto.getGuidedPrice();
         BigDecimal purchasePrice = dto.getPurchasePrice();
@@ -198,12 +197,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             return rb.setMsg("采购价格不能为空");
         }
         if (StringUtils.isBlank(sid)) {//新增
+            BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
             String billNo = getApplyCode(dto.getUserSid());
             dto.setApplicationCode(billNo);
-            BeanUtil.copyProperties(dto, entity);
-            entity.setSid(sid1);
-            entity.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-            /*entity.setApplicationCode(generateBillNo(dto.getUserSid()).get("billNo_Num"));*/
+            BeanUtil.copyProperties(dto, entity,"sid");
+            entity.setApplicationCode(billNo);
+            entity.setApplicationDate(DateUtil.formatDate(new Date()));
             String staffSid = dto.getStaffSid();
             ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
             List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
@@ -245,7 +244,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
                 BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();
                 BeanUtil.copyProperties(baseOutsourcingApplicationVehicleDto, baseOutsourcingApplicationVehicle);
-                baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
+                baseOutsourcingApplicationVehicle.setOutAppSid(entity.getSid());
                 baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
             }
             if (contract != null && com.yxt.common.base.utils.StringUtils.isNotBlank(contract.getFilePath())) {

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

@@ -84,4 +84,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     @Select("select * from base_trailer where vehSid = #{sid}")
     BaseTrailerDetailsVo fetchByVehSid(String sid);
+
+    String selectNum(String billNo);
 }

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

@@ -55,4 +55,12 @@
                 FROM base_trailer bt
                         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from base_vehicle_out
+        where billNo LIKE concat(#{billNo}, '%')
+        order by id desc
+                limit 1
+    </select>
 </mapper>

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

@@ -104,4 +104,9 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 		PagerVo<BaseTrailerSearchVo> pv1 = PagerUtil.pageToVo(page, pv);
 		return rb.success().setData(pv1);
 	}
+
+	@Override
+	public ResultBean trailerOut(BaseTrailerDto dto) {
+		return baseTrailerService.trailerOut(dto);
+	}
 }

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

@@ -38,6 +38,8 @@ import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -47,8 +49,10 @@ import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
+import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService;
 import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
@@ -113,6 +117,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private BaseManufacturerService baseManufacturerService;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseVehicleOutService baseVehicleOutService;
 
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -145,7 +151,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         IPage<BaseTrailerVo> pagging = baseMapper.selectPageVo(page, qw);
         for (BaseTrailerVo record : pagging.getRecords()) {
             String trailerModelSid = record.getTrailerModelSid();
-            if (StringUtils.isNotBlank(trailerModelSid)){
+            if (StringUtils.isNotBlank(trailerModelSid)) {
                 BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid);
                 String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
                 String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
@@ -270,19 +276,19 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
         StkInStock stkInStock = new StkInStock();
         //入库日期:FDate  (必填项)
-        stkInStock.setFDate(DateUtil.now());
+        stkInStock.setFDate(dto.getWarehousingDate());
         //采购部门:FPurchaseDeptId  (必填项)
         String departmentSid = dto.getDepartmentSid();
         SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
         stkInStock.setFPurchaseDeptId(data.getOrgCode());
         BasePurchaseSystemDetailsVo data1 = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData();
         ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
-        if (data1 != null){
+        if (data1 != null) {
             //采购组织:FPurchaseOrgId  (必填项)
             stkInStock.setFPurchaseOrgId(data1.getOrgCode());
             //分配目标组织:TOrgId  (必填项)
             stkInStock.setTOrgId(data1.getOrgCode());
-        }else {
+        } else {
             SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
             if (vo != null) {
                 //采购组织:FPurchaseOrgId  (必填项)
@@ -399,4 +405,30 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public BaseTrailerDetailsVo fetchByVehSid(String sid) {
         return baseMapper.fetchByVehSid(sid);
     }
+
+    public ResultBean trailerOut(BaseTrailerDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String vehSid = dto.getVehSid();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
+        if (!baseVehicle.equals("0002")) {
+            return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
+        }
+        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(dto.getUseOrgSid(), vehSid);
+        BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
+        BeanUtil.copyProperties(baseVehicleOutDetailsVo,baseVehicleOut,"sid");
+        String billNo = "";
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
+        String i = baseMapper.selectNum(billNo);
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(billNo, 0);
+        }
+        baseVehicleOut.setBillNo(billNo);
+        return null;
+    }
+
+
 }

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

@@ -499,7 +499,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             /**
              *  // 入库日期:FDate  (必填项)
              */
-            stkInStock.setFDate(DateUtil.now());
+            stkInStock.setFDate(baseVehicle.getPriceDate());
 
             /**
              * // 物料列表:FInStockEntry  (必填项)
@@ -835,6 +835,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.selExistingCar(createOrgSid);
     }
 
+    @Override
+    public ResultBean<List<BaseExistingCarListVo>> selVehByStockState(String createOrgSid) {
+        return baseVehicleService.selVehByStockState(createOrgSid);
+    }
+
     /**
      * 根据车架号查询现车详情
      *

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

@@ -1121,13 +1121,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath,String name) {
+    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath, String name) {
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath,name);
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath, name);
         if (vins.size() <= 0) {
             for (AppVinsDetailsVo vin : vins) {
                 vins.add(vin);
@@ -1781,10 +1781,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private QueryWrapper<BaseVehicle> vehicleActualWrapper(BaseChoiceVehicleQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
-            if(StringUtils.isNotBlank(params.getOrgPath())){
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("bv.createOrgSid", orgSid);
-            }else{
+            } else {
                 //本分公司
                 if (StringUtils.isNotBlank(params.getUserSid())) {
                     String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
@@ -2165,14 +2165,47 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
                 BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
-                if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
-                    existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
-                    existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
-                    existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
-                    existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
-                    existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
-                    existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
-                    break;
+                if (busSalesOrderDetailsVo != null) {
+                    if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
+                        existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
+                        existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
+                        existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
+                        existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
+                        existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
+                        existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
+                        break;
+                    }
+                }
+            }
+        }
+        return rb.success().setData(baseExistingCarListVo);
+    }
+
+    public ResultBean<List<BaseExistingCarListVo>> selVehByStockState(String createOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = baseVehinstallService.selectListVo(createOrgSid);
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        qw.eq("bv.createOrgSid", createOrgSid);
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0002"));
+        if (stringList.size() > 0) {
+            qw.notIn("bv.vinNo", stringList);
+        }
+        List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
+        for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {
+            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
+            for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
+                BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
+                if (busSalesOrderDetailsVo != null) {
+                    if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
+                        existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
+                        existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
+                        existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
+                        existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
+                        existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
+                        existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
+                        break;
+                    }
                 }
             }
         }
@@ -2190,10 +2223,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         VehicleCostListQuery query = pagerQuery.getParams();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (query != null) {
-            if(StringUtils.isNotBlank(query.getOrgPath())){
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
                 ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
                 qw.eq("bv.useOrgSid", resultBean.getData());
-            }else{
+            } else {
                 if (StringUtils.isNotBlank(query.getUserSid())) {
                     ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
                     qw.eq("bv.useOrgSid", resultBean.getData());
@@ -2256,10 +2289,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<VinByWarehouseQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppScmWarehouseVinVo> qw = new QueryWrapper();
         VinByWarehouseQuery params = pagerQuery.getParams();
-        if(StringUtils.isNotBlank(params.getOrgPath())){
+        if (StringUtils.isNotBlank(params.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
             params.setUseOrgSid(useOrgSid);
-        }else{
+        } else {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
             params.setUseOrgSid(useOrgSid);
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -36,4 +36,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
 
     @Select("select * from base_vehicle_out where mainSid = #{xsckdSid}")
     List<BaseVehicleOut> fetchByMainSid(String xsckdSid);
+
+    BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -104,4 +104,12 @@
         order by id desc
                 limit 1
     </select>
+
+    <select id="selByOrgSidAndVehSid" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
+        SELECT *
+        FROM base_vehicle_out
+        WHERE createOrgSid = #{useOrgSid}
+          AND vinSid = #{vehSid}
+          AND type = "001"
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -249,10 +249,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOutApply.setSaleTypeKey(dto.getTypeKey());
         baseVehicleOutApply.setSaleTypeValue(dto.getType());
         baseVehicleOutApply.setCreateOrgSid(dto.getCreateOrgSid());
+        baseVehicleOutApply.setCreateBySid(dto.getCreateBySid());
         //保存车辆出库单主表
         baseVehicleOutApplyService.save(baseVehicleOutApply);
         //出库单子表关联主表sid
         baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
+        baseVehicleOut.setCreateBySid(dto.getCreateBySid());
+        baseVehicleOut.setCreateByName(dto.getCreateByName());
         //保存车辆出库单子表
         baseMapper.insert(baseVehicleOut);
         dto.setBillNo(billNo);
@@ -560,7 +563,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //单据编号
         salOutStock.setFBillNo(dto.getBillNo());
         //日期
-        salOutStock.setFDate(DateUtil.today());
+        salOutStock.setFDate(dto.getSaleDate());
         //分公司id
         BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
         if (data != null){
@@ -941,4 +944,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         return note;
     }
+
+    public BaseVehicleOutDetailsVo selByOrgSidAndVehSid(String useOrgSid, String vehSid) {
+        return baseMapper.selByOrgSidAndVehSid(useOrgSid,vehSid);
+    }
 }

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

@@ -127,7 +127,7 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 		if (StringUtils.isBlank(dto.getSid())){
 			StkInStock stkInStock = new StkInStock();
 			//入库日期:FDate  (必填项)
-			stkInStock.setFDate(DateUtil.now());
+			stkInStock.setFDate(dto.getPriceDate());
 			//采购部门:FPurchaseDeptId  (必填项)
 			String departmentSid = dto.getDepartmentSid();
 			SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -95,7 +95,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span><span class="icon">*</span>付款方</span>
+            <span><span class="icon">*</span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item prop="payerName">

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue

@@ -89,7 +89,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span>付款方</span>
+            <span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue

@@ -98,7 +98,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span>付款方</span>
+            <span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.terminal.api.app.flowable.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -78,7 +79,8 @@ public class AppService {
         List<AppFlowableRecordVo> progressList = progressdata.getData();
         progressList.forEach(f->{
             AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo();
-            a.setTime(f.getCreateTime());
+            a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime());
+           // a.setTime(f.getCreateTime());
             a.setFlowableRecordVo(f);
             a.setState(0+"");
             list.add(a);