修改问题

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -21,6 +21,7 @@ public enum BillTypeEnum {
     JYDDCLYD("JYDDCLYD","简易订单车辆预定"),
     XSDDHT("XSDDHT","销售订单合同"),
     XSDD("XSDD","销售订单"),
+    SKD("SKD","款项确认"),
     ;
 
     private String billType;

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

@@ -217,7 +217,7 @@
     </update>
 
     <select id="getDetails" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
-        select sid,purchaseSystemName from base_purchase_system where useOrgSid = #{createOrgSid} and deptSid = #{deptSid}
+        select sid,purchaseSystemName from base_purchase_system where useOrgSid = #{createOrgSid} and deptSid = #{deptSid} limit 1
     </select>
 
     <select id="selectApply" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply">

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -143,12 +143,12 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(@RequestBody PagerQuery<BusDeliveredExamineQuery> pq);
 
-    @ApiOperation("提交车库移库审批流程")
+    @ApiOperation("提交出库审批流程")
     @PostMapping("/submitDeliveredApply")
     @ResponseBody
     public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);
 
-    @ApiOperation("App-提交车库移库审批流程")
+    @ApiOperation("App-提交出库审批流程")
     @PostMapping("/submitAppDeliveredApply")
     @ResponseBody
     public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -130,4 +130,7 @@ public class BusSalesOrder extends BaseEntity {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("补充说明附件")
+    private String imagesFile;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -188,7 +188,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean updateNodesBySid(@RequestBody AppOrderRemarkDto dto);
 
-    @ApiOperation("更新销售订单补充说明")
+    @ApiOperation("初始化销售订单补充说明")
+    @GetMapping("/getOrderRemarksInfo")
+    @ResponseBody
+    ResultBean<OrderRemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid);
+
+    @ApiOperation("更新销售订单合同编号")
     @PutMapping("/updateContractNoBySid")
     @ResponseBody
     ResultBean updateContractNoBySid(@RequestBody AppOrderContractNoDto dto);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -165,6 +165,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java

@@ -26,4 +26,9 @@ public class AppNowCarListVo implements Vo {
     @ApiModelProperty("上装sid")
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java

@@ -24,4 +24,9 @@ public class AppNowCarVo implements Vo {
     private String virtual;
     @ApiModelProperty("上装配置sid")
     private String topSid;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java

@@ -31,5 +31,10 @@ public class AppReadyCarListVo implements Vo {
 
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java

@@ -32,4 +32,9 @@ public class AppReadyCarVo implements Vo {
     @ApiModelProperty("上装配置sid")
     private String topSid;
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/8 9:54
@@ -17,4 +19,7 @@ public class AppOrderRemarkDto implements Dto {
 
     @ApiModelProperty(value = "备注说明")
     private String remarks;
+
+    @ApiModelProperty("补充说明附件")
+    private List<String> images;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 14:30
+ * @Description
+ */
+@Data
+public class OrderRemarksVo implements Vo {
+    private static final long serialVersionUID = -5111561669820677541L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty(value = "补充说明")
+    private String remarks;
+
+    @ApiModelProperty("补充说明附件")
+    private List<String> images;
+
+    private String imagesFile;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -192,4 +192,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     int updateMakeUp1(String salesOrderSid);
 
     int updatePurchaseSystem(@Param("purchaseSystemName") String purchaseSystemName, @Param("purchaseSystemSid") String purchaseSystemSid, @Param("salesOrderSid") String salesOrderSid);
+
+    int updateImages(@Param("imagesFile") String imagesFile, @Param("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -312,4 +312,8 @@
             purchaseSystemSid  = #{purchaseSystemSid}
         where sid = #{salesOrderSid}
     </update>
+
+    <update id="updateImages">
+        update bus_sales_order set imagesFile = #{imagesFile} where sid = #{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -236,6 +236,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.updateNodesBySid(dto);
     }
 
+    @Override
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return busSalesOrderService.getOrderRemarksInfo(saleOrderSid);
+    }
+
     @Override
     public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
         return busSalesOrderService.updateContractNoBySid(dto);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitF
 import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
@@ -1475,7 +1476,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //金融方案状态
             vo.setFinanceInfoState(0);
             //补充说明状态
-            if (StringUtils.isNotBlank(busSalesOrder.getNotes())) {
+            if (StringUtils.isNotBlank(busSalesOrder.getNotes()) && StringUtils.isNotBlank(busSalesOrder.getImagesFile())) {
                 vo.setRemarksStete(1);
                 vo.setRemarks(busSalesOrder.getNotes());
             } else {
@@ -1837,6 +1838,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //将该车型下的所有现车的车架号组合放入集合中
                     vinNoList.add(vehicleOrderVo.getVin());
                     vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
+                    //根据车辆sid查询该车架号的采购系统
+                    ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                    if(vehicleSelectVoResultBean.getData() != null){
+                        BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                        appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appNowCars.add(appNowCarVo);
                 }
 
@@ -1858,6 +1870,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
                             vinNoList.add(vehicleOrderVo.getVin());
                             vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
+                            //根据车辆sid查询该车架号的采购系统
+                            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                            if(vehicleSelectVoResultBean.getData() != null){
+                                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                                //采购系统sid
+                                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                                //采购系统名称
+                                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                                appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                                appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                            }
                             appNowCars.add(appNowCarVo);
                         }
                     }
@@ -1891,6 +1914,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     //将每个采购订单的编号及可使用数量放入map集合中用来对比车型信息是否发生了变化
                     map.put(applyListVo.getOrderId(), appReadyCarVo.getCanUseNum());
+                    //根据采购订单查询采购系统的sid和采购系统的名称
+                    ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid());
+                    if(getDetails.getData() != null){
+                        BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                        appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appReadyCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appReadyCar.add(appReadyCarVo);
                 }
                 appCarInfo.setReadyCar(appReadyCar);
@@ -2068,6 +2102,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据车辆sid查询该车架号的采购系统
+                    ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                    if(vehicleSelectVoResultBean.getData() != null){
+                        BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                        appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appNowCars.add(appNowCarVo);
                 }
             }
@@ -2086,6 +2131,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                         AppNowCarVo appNowCarVo = new AppNowCarVo();
                         BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                        //根据车辆sid查询该车架号的采购系统
+                        ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
+                        if(vehicleSelectVoResultBean.getData() != null){
+                            BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                            //采购系统sid
+                            String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                            //采购系统名称
+                            String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                            appNowCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                            appNowCarVo.setPurchaseSystemName(purchaseSystemName);
+                        }
                         appNowCars.add(appNowCarVo);
                     }
                 }
@@ -2119,6 +2175,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     } else {
                         appReadyCarVo.setCanUseNum("0");
                     }
+                    //根据采购订单查询采购系统的sid和采购系统的名称
+                    ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid());
+                    if(getDetails.getData() != null){
+                        BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                        //采购系统sid
+                        String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                        //采购系统名称
+                        String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                        appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid);
+                        appReadyCarVo.setPurchaseSystemName(purchaseSystemName);
+                    }
                     appReadyCar.add(appReadyCarVo);
                 }
             }
@@ -2339,6 +2406,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
+        List<String> images = dto.getImages();
+        if(images.size()>0){
+            String imagesFile = images.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+            int i = baseMapper.updateImages(imagesFile,sid);
+        }
         //根据销售订单sid更新补充说明字段
         int i = baseMapper.updateNodesBySid(dto.getRemarks(), sid);
         return rb.success().setMsg("保存成功");
@@ -3562,4 +3634,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public int updatePurchaseSystem(String purchaseSystemName, String purchaseSystemSid, String salesOrderSid) {
         return baseMapper.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
     }
+
+    public ResultBean<OrderRemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        /*ResultBean<OrderRemarksVo> rb = ResultBean.fireFail();
+        OrderRemarksVo vo = baseMapper.getOrderRemarksInfo(saleOrderSid);
+        String imageFile = vo.getImagesFile();
+        if(StringUtils.isNotBlank(imageFile)){
+            List<String> imagesFile = Arrays.
+
+        }
+        return rb.success().setData(vo);*/
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -40,6 +40,7 @@ import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -91,7 +92,21 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     }
 
     public List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        List<AppNowCarListVo> voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        voList.removeAll(Collections.singleton(null));
+        for (AppNowCarListVo vv : voList){
+            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vv.getCarSid());
+            if(vehicleSelectVoResultBean.getData() != null){
+                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                //采购系统sid
+                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                //采购系统名称
+                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                vv.setPurchaseSystemSid(purchaseSystemSid);
+                vv.setPurchaseSystemName(purchaseSystemName);
+            }
+        }
+        return voList;
        /* List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppNowCarList> appNowCars = new ArrayList<>();
         for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -39,6 +39,7 @@ import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -95,7 +96,24 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     }
 
     public List<AppReadyCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        List<AppReadyCarListVo> voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        voList.removeAll(Collections.singleton(null));
+        if(!voList.isEmpty()){
+            for (AppReadyCarListVo vv : voList){
+                //根据采购订单查询采购系统的sid和采购系统的名称
+                ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(vv.getSid());
+                if(getDetails.getData() != null){
+                    BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                    //采购系统sid
+                    String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                    //采购系统名称
+                    String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                    vv.setPurchaseSystemSid(purchaseSystemSid);
+                    vv.setPurchaseSystemName(purchaseSystemName);
+                }
+            }
+        }
+        return voList;
       /*  List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppReadyCarListVo> appReadyCar = new ArrayList<>();
         for (BusSalesVehicleOrder busSalesVehicleOrder : stringList) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,5 +59,9 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     @ApiModelProperty("付款账号后4位")
     private String payAccount;
 
+    @ApiModelProperty("单据编号")
+    @JsonProperty("collectionBillId")
+    private String billNo;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java

@@ -83,5 +83,8 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     @ApiModelProperty("申请人名称")
     private String createByName;
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@@ -53,5 +53,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
     @ApiModelProperty("申请人")
     private String createByName;
 
+    private String billNo;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -108,4 +108,6 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String accountSid;
     @ApiModelProperty("申请部门sid")
     private String createDeptSid;
+    @ApiModelProperty("单据编号")
+    private String billNo;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -103,5 +103,8 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
     @ApiModelProperty("付款银行")
     private String payBank;
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@@ -89,4 +89,7 @@ public class FinCollectionConfirmationVo implements Vo {
 
     @ApiModelProperty("申请人")
     private String createByName;
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java

@@ -39,5 +39,5 @@ public class FinPaymentrecordUpdateDto implements Dto {
     private String payWayValue;
 
     @ApiModelProperty(value = "付款凭证")
-    private String payFile;
+    private List<String> payFiles;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentrecordVo.java <br/>
@@ -79,6 +81,8 @@ public class FinPaymentrecordVo implements Vo {
     @ApiModelProperty(value = "金额")
     private Integer cost;
     @ApiModelProperty(value = "付款凭证")
+    private List<String> payFiles;
+
     private String payFile;
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -107,4 +107,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     List<String> getList(@Param("stringList") List<String> stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid);
 
     FinCollectionConfirmation selectByBusSid(String virtualOrderSid);
+
+    String selectNum(String bill);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -35,7 +35,8 @@
         receivingName,
         payAccount,
         payBank,
-        createByName
+        createByName,
+        billNo
         FROM
         fin_collection_confirmation
         <where>
@@ -64,7 +65,8 @@
                payAccount,
                payBank,
                accountSid,
-               createByName
+               createByName,
+               billNo
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
           AND useOrgSid = #{useOrgSid}
@@ -82,7 +84,8 @@
                paymentVoucherUrl,
                remarks,
                payAccount,
-               receivingName
+               receivingName,
+               billNo
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>
@@ -117,4 +120,12 @@
     <select id="selectByBusSid" resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation">
         select * from fin_collection_confirmation where busSid = #{virtualOrderSid}
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from fin_collection_confirmation
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -38,7 +38,10 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
 import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
@@ -250,6 +253,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return p;
     }
 
+    public String getApplyCode(String useOrgSid) {
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.SKD.getBillType());
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public ResultBean saveAllDto(FinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -363,6 +383,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finCollectionConfirmation.setAuditState(1);
             //1未认款/2部分认款/3已认款
             finCollectionConfirmation.setPaymentState(1);
+            //添加单据编号
+            String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
+            finCollectionConfirmation.setBillNo(billNo);
+
             baseMapper.insert(finCollectionConfirmation);
 
 
@@ -776,6 +800,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmation.setCreateDate(DateUtil.today());
         finCollectionConfirmation.setCreateBySid(dto.getUserSid());
         finCollectionConfirmation.setCreateDeptSid(createDeptSid);
+        //添加单据编号
+        String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
+        finCollectionConfirmation.setBillNo(billNo);
         //打款凭证
         List<String> payFiles = dto.getPayFiles();
         if (payFiles.size() > 0) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -150,6 +150,22 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         qw.orderByDesc("fp.createTime");
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<FinPaymentrecordVo> list = pagging.getRecords();
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            for (FinPaymentrecordVo vv : list){
+                String payFile = vv.getPayFile();
+                if(StringUtils.isNotBlank(payFile)){
+                    List<String> strings = Arrays.asList(payFile.split(","));
+                    for (int i =0;i<strings.size();i++){
+                        if(!strings.get(i).contains(fileUploadComponent.getUrlPrefix())){
+                            strings.set(i,fileUploadComponent.getUrlPrefix()+strings.get(i));
+                        }
+                    }
+                    vv.setPayFiles(strings);
+                }
+            }
+        }
         PagerVo<FinPaymentrecordVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -187,6 +203,11 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
+            List<String> payFiles = dto.getPayFiles();
+            if(payFiles.size()>0){
+                String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+                finPaymentrecord.setPayFile(payFile);
+            }
             baseMapper.updateById(finPaymentrecord);
             //更新付款申请中的状态
             FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -219,6 +219,11 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean updateNodesBySid(@RequestBody OrderRemarksDto dto);
 
+    @ApiOperation("初始化销售订单补充说明")
+    @GetMapping("/getOrderRemarksInfo")
+    @ResponseBody
+    ResultBean<RemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid);
+
     /*-----------------------------------------提交------------------------------------------*/
 
     @ApiOperation("判断销售订单是否可提交")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -192,6 +192,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<RemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean isSubmit(String sid) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,4 +30,10 @@ public class NowCarVo implements Vo {
     private String virtual;
     @ApiModelProperty("上装配置sid")
     private String topSid;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    @JsonProperty("paySystem")
+    private String purchaseSystemName;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,4 +36,10 @@ public class ReadyCarVo implements Vo {
     private String msg;
     @ApiModelProperty("上装配置sid")
     private String topSid;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    @JsonProperty("paySystem")
+    private String purchaseSystemName;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/8 9:49
@@ -18,4 +20,7 @@ public class OrderRemarksDto implements Dto {
 
     @ApiModelProperty(value = "补充说明")
     private String remarks;
+
+    @ApiModelProperty("补充说明附件")
+    private List<String> images;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/RemarksVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 14:22
+ * @Description
+ */
+@Data
+public class RemarksVo implements Vo {
+    private static final long serialVersionUID = 3777312179499130622L;
+
+    @ApiModelProperty("补充说明")
+    private String remarks;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("补充说明附件")
+    private List<String> images = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -48,5 +49,9 @@ public class ConfirmationDetailedVo implements Vo {
     private String receivingName;
     @ApiModelProperty("付款账号后4位")
     private String payAccount;
+
+    @ApiModelProperty("单据编号")
+    @JsonProperty("collectionBillId")
+    private String billNo;
 }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -79,4 +80,8 @@ public class ConfirmationInitVo implements Vo {
     private String accountSid;
     @ApiModelProperty("申请人名称")
     private String createByName;
+
+    @ApiModelProperty("单据编号")
+    @JsonProperty("collectionBillId")
+    private String billNo;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java

@@ -50,4 +50,8 @@ public class ConfirmationPageVo implements Vo {
     @ApiModelProperty("付款账号后4位")
     private String payAccount;
 
+    @ApiModelProperty("单据编号")
+    @JsonProperty("collectionBillId")
+    private String billNo;
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -279,6 +279,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.updateNodesBySid(dto);
     }
 
+    @Override
+    public ResultBean<RemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        return appBusSalesOrderService.getOrderRemarksInfo(saleOrderSid);
+    }
+
     @Override
     public ResultBean isSubmit(String sid) {
         return appBusSalesOrderService.isSubmit(sid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -607,4 +607,9 @@ public class AppBusSalesOrderService {
         }
         return rb.success();
     }
+
+    public ResultBean<RemarksVo> getOrderRemarksInfo(String saleOrderSid) {
+        ResultBean<RemarksVo> rb = ResultBean.fireFail();
+        return null;
+    }
 }