Merge remote-tracking branch 'origin/master'

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

@@ -2,12 +2,13 @@ package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 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.ApiImplicitParam;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -399,4 +400,14 @@ public interface BaseVehicleFeign {
     @PostMapping("/getInspectionVinList")
     @ResponseBody
     public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(@RequestBody PagerQuery<InspectionVinQuery> pagerQuery);
+
+    @ApiOperation("PC-巡检获取车价号")
+    @PostMapping("/getPCInspectionVinList")
+    @ResponseBody
+    public ResultBean<List<Map<String,String>>> getPCInspectionVinList(@RequestBody InspectionVinQuery query);
+
+    @ApiOperation("销售订单补录选择车架号")
+    @PostMapping("/saleOrderVin")
+    @ResponseBody
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(@RequestBody PagerQuery<InputVinListQuery> query);
 }

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

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -311,4 +313,14 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getPCInspectionVinList(InspectionVinQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        return null;
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 16:48
+ * @Description
+ */
+@Data
+public class InputVinListQuery implements Query {
+    private static final long serialVersionUID = 8552949553126528497L;
+
+    private String saleOrderSid;
+    private List<String> list;
+    private String names;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 16:48
+ * @Description
+ */
+@Data
+public class InputVinListVo implements Vo {
+    private static final long serialVersionUID = -9168643121079621489L;
+
+    private String vinNo;
+    private String vinSid;
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java

@@ -35,4 +35,7 @@ public class AppBaseVehicleActualDetailsVo implements Vo {
     private int vehicleNum;
 
     private BaseVehiVesionVo carDetailPage;
+
+    @ApiModelProperty("买断金额")
+    private String actualMoney;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/AppBaseVehicleActualPayVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.base.api.basevehicleactualpay;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 9:05
+ * @Description
+ */
+@Data
+public class AppBaseVehicleActualPayVo implements Vo {
+    private static final long serialVersionUID = -1583740093554518398L;
+
+    @ApiModelProperty(value = "付款方式")
+    private String paymentType;
+    @ApiModelProperty(value = "厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty(value = "开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    private String payAccount;
+    @ApiModelProperty("付款备注")
+    private String payRemark;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.base.api.basevehicleactualsales;
 
 import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetailsVo;
+import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,8 +32,16 @@ public class AppBaseVehicleActualSalesVo implements Vo {
     @ApiModelProperty("买断原因")
     private String reason;
 
-    private List<AppBaseVehicleActualDetailsVo> records;
+    private List<AppBaseVehicleActualDetailsVo> records = new ArrayList<>();
+
+    private List<AppBaseVehicleActualPayVo> payList = new ArrayList<>();
 
     @ApiModelProperty("未售买断费用")
     private String money;
+    @ApiModelProperty("是否需要付款")
+    private String payState;
+    @ApiModelProperty("是否需要付款key")
+    private String payStateKey;
+    @ApiModelProperty("付款明细合计")
+    private String payDetailTotal;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -191,4 +191,8 @@ public interface CommonContractFeign {
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody CommonContractTaskQuery query);
 
+    @ApiOperation(value = "根据销售订单查询合同")
+    @GetMapping(value = "/getContractByBusSid/{sid}")
+    ResultBean<CommonContract> getContractByBusSid(@PathVariable("sid") String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -203,4 +203,9 @@ public class CommonContractFeignFallback implements CommonContractFeign {
     public ResultBean breakProcess(CommonContractTaskQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -552,7 +552,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 货主:FOwnerID  (必填项)
              */
-            fe.setFOwnerID("101");
+            //fe.setFOwnerID("101");
             /**
              * 仓库:FStockID
              */
@@ -561,7 +561,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 库存状态:FStockStatusID
              */
-            fe.setFStockStatusID("KCZT01_SYS");
+            // fe.setFStockStatusID("KCZT01_SYS");
             fEntity.add(fe);
         }
         salOutStock.setFEntity(fEntity);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -641,8 +641,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     public List<AppModelConfigListVo> addDonfigName(List<AppModelConfigListVo> appModelConfigListVos) {
         for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
             //颜色
-            String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor())
-                    ? (appModelConfigListVo.getCarColor() + "/") : "";
+           /* String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor())
+                    ? (appModelConfigListVo.getCarColor() + "/") : "";*/
             //缓速器
 //            String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
 //                    && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
@@ -708,7 +708,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 //                    && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
                     ? (appModelConfigListVo.getMultimedia() + "/") : "";
 
-            String configName = color + slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
+            String configName =  slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                     baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
             appModelConfigListVo.setConfigName(configName);
         }

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

@@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -458,4 +455,9 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<InspectionVinVo> getInspectionVinList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
 
     List<BaseSpecialRebateDisGetVehVo> getVehBySpecialRebateSid(String specialRebateSid);
+
+    List<Map<String,String>> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
+
+
+    IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
 }

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

@@ -1146,14 +1146,38 @@
 
     <select id="getInspectionVinList" resultType="com.yxt.anrui.base.api.basevehicle.InspectionVinVo">
         select
-            sid as carSid,
-            vinNo as vin,
-            location as addressSid,
-            locationName as address,
-            modelName as  model,
-            modelSid
+        sid as carSid,
+        vinNo as vin,
+        location as addressSid,
+        locationName as address,
+        modelName as model,
+        modelSid
         from
-            base_vehicle bv
+        base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getPCInspectionVinList" resultType="java.util.Map">
+        select
+        sid as carSid,
+        vinNo as vin,
+        location as addressSid,
+        locationName as address,
+        modelName as model,
+        modelSid
+        from
+        base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="saleOrderVin" resultType="com.yxt.anrui.base.api.basevehicle.app.InputVinListVo">
+        select bv.vinNo,bv.sid vinSid,
+        if(bv.vehicleStateValue='出库',1,0) as state
+        from base_vehicle bv
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -181,11 +183,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
                 baseVehicleService.updateVeh(baseVehicle);
             //入账生成台账
-            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){
+            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) {
                 baseVehicleService.saveVeh_rz(baseVehicle);
             }
             //外采入库生成台账
-            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
+            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) {
                 baseVehicleService.saveVeh_wc(baseVehicle);
             }
             //调车入库生成台账
@@ -193,7 +195,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 baseVehicleService.saveVeh_tc(baseVehicle);
         }
         if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())
-                ||eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) {
+                || eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) {
             kingdeeStkInStock(dto);
         }
         return rb.success().setMsg("保存成功");
@@ -201,68 +203,69 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     /**
      * 推送金蝶采购入库单
+     *
      * @param dto
      */
-    private void kingdeeStkInStock(List<BaseVehicleDto> dto ) {
-        try{
-                StkInStock stkInStock=new StkInStock();
+    private void kingdeeStkInStock(List<BaseVehicleDto> dto) {
+        try {
+            StkInStock stkInStock = new StkInStock();
+            /**
+             *  // 入库日期:FDate  (必填项)
+             */
+            stkInStock.setFDate(DateUtil.now());
+            /**
+             *   // 采购部门:FPurchaseDeptId  (必填项)
+             */
+            stkInStock.setFPurchaseDeptId("05.04");
+            /**
+             *  //采购组织:FPurchaseOrgId  (必填项)
+             */
+            stkInStock.setFPurchaseOrgId("101");
+            /**
+             * // 供应商:FSupplierId  (必填项)
+             */
+            stkInStock.setFSupplierId("010001");
+            /**
+             *  //分配目标组织:TOrgId  (必填项)
+             */
+            stkInStock.setTOrgId("100012");
+            /**
+             * // 物料列表:FInStockEntry  (必填项)
+             */
+            List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
+            for (BaseVehicleDto baseVehicleDto : dto) {
+                StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
                 /**
-                 *  // 入库日期:FDate  (必填项)
+                 * 单价   对应厂家结算价
                  */
-                stkInStock.setFDate(DateUtil.now());
+                sf.setFPrice(baseVehicleDto.getCostPrice() + "");
+
                 /**
-                 *   // 采购部门:FPurchaseDeptId  (必填项)
+                 * 车辆类型
                  */
-                stkInStock.setFPurchaseDeptId("05.04");
+                sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中  规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
+
                 /**
-                 *  //采购组织:FPurchaseOrgId  (必填项)
+                 *   //  批号:FLot
                  */
-                stkInStock.setFPurchaseOrgId("101");
+                sf.setFLot(baseVehicleDto.getVinNo());
                 /**
-                 * // 供应商:FSupplierId  (必填项)
+                 *  // 物料编码:FMaterialId  (必填项)
                  */
-                stkInStock.setFSupplierId("010001");
+                sf.setFMaterialId(baseVehicleDto.getVinNo());
                 /**
-                 *  //分配目标组织:TOrgId  (必填项)
+                 *   //  仓库:FStockId
                  */
-                stkInStock.setTOrgId("100012");
+                sf.setFStockId("CK001");
                 /**
-                 * // 物料列表:FInStockEntry  (必填项)
+                 * 物料分组
                  */
-                List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>();
-                for (BaseVehicleDto baseVehicleDto : dto) {
-                    StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry();
-                    /**
-                     * 单价   对应厂家结算价
-                     */
-                    sf.setFPrice(baseVehicleDto.getCostPrice()+"");
-
-                    /**
-                     * 车辆类型
-                     */
-                    sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中  规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
-
-                    /**
-                     *   //  批号:FLot
-                     */
-                    sf.setFLot(baseVehicleDto.getVinNo());
-                    /**
-                     *  // 物料编码:FMaterialId  (必填项)
-                     */
-                    sf.setFMaterialId(baseVehicleDto.getVinNo());
-                    /**
-                     *   //  仓库:FStockId
-                     */
-                    sf.setFStockId("CK001");
-                    /**
-                     * 物料分组
-                     */
-                    sf.setWlfz("01");
-                    fInStockEntry.add(sf);
-                }
-                stkInStock.setFInStockEntry(fInStockEntry);
-                finKingDeeFeign.draftStkInStock(stkInStock);
-        }catch (Exception e){
+                sf.setWlfz("01");
+                fInStockEntry.add(sf);
+            }
+            stkInStock.setFInStockEntry(fInStockEntry);
+            finKingDeeFeign.draftStkInStock(stkInStock);
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -856,7 +859,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         PagerVo<AppScmWarehouseVinVo> page = new PagerVo<>();
         //查询在申请的存放地点变更车辆的车辆sid
         List<String> stringList = baseVehicleTempstateService.selectAll("001");
-        IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList);
+        IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery, stringList);
         PagerVo<AppScmWarehouseVinVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppScmWarehouseVinVo>>().success().setData(pagerVo);
     }
@@ -868,7 +871,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Override
     public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
-        return baseVehicleService.selectPatrolinspections(userSid,vinNoList);
+        return baseVehicleService.selectPatrolinspections(userSid, vinNoList);
     }
 
     @Override
@@ -889,4 +892,20 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return new ResultBean<PagerVo<InspectionVinVo>>().success().setData(pagerVo);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getPCInspectionVinList(InspectionVinQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        List<Map<String, String>> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query);
+        return rb.success().setData(pcInspectionVinList);
+    }
+    @Override
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        ResultBean<PagerVo<InputVinListVo>> rb = ResultBean.fireFail();
+        PagerVo<InputVinListVo> pv = baseVehicleService.saleOrderVin(query);
+        return rb.success().setData(pv);
+    }
+
 }

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

@@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
@@ -26,6 +28,8 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -34,7 +38,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -102,6 +105,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BaseVehicleTempstateService baseVehicleTempstateService;
     @Autowired
     private ScmWarehouseFeign scmWarehouseFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     /**
      * 车辆信息分页列表
@@ -587,16 +592,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             configDetailVo.setMoreConfig(otherConfig);
         }
         //拼接常用配置字段
-        String modelInfoName = modelInfoName(currentCarVo);
+        String modelInfoName = modelInfoName(configVo);
         configDetailVo.setModelInfoName(modelInfoName);
         return configDetailVo;
     }
 
 
     //    拼接常用配置字段
-    public String modelInfoName(AppCurrentCarDetailVo currentCarVo) {
+    public String modelInfoName(AppModelConfigDetailsVo configVo) {
 
-        String brandName = StringUtils.isNotBlank(currentCarVo.getBrandName()) ? (currentCarVo.getBrandName() + "/") : "";
+      /*  String brandName = StringUtils.isNotBlank(currentCarVo.getBrandName()) ? (currentCarVo.getBrandName() + "/") : "";
         String vehicleType = StringUtils.isNotBlank(currentCarVo.getVehicleTypeValue()) ? (currentCarVo.getVehicleTypeValue() + "/") : "";
         String productLine = StringUtils.isNotBlank(currentCarVo.getProductLineValue()) ? (currentCarVo.getProductLineValue() + "/") : "";
         String driveForm = StringUtils.isNotBlank(currentCarVo.getDriveFormValue()) ? (currentCarVo.getDriveFormValue() + "/") : "";
@@ -611,7 +616,69 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String department = StringUtils.isNotBlank(currentCarVo.getDepartment()) ? (currentCarVo.getDepartment() + "/") : "";
         String modelInfoName = brandName + vehicleType + productLine + driveForm + power + vehicleVersion + fuelType +
                 gearboxType + emissionStandard + engineType + marketSegments + specifications + department;
-        return modelInfoName.substring(0, modelInfoName.length() - 1);
+        return modelInfoName.substring(0, modelInfoName.length() - 1);*/
+        String color = StringUtils.isNotBlank(configVo.getCarColor())
+                ? (configVo.getCarColor() + "/") : "";
+        String slowMachine = StringUtils.isNotBlank(configVo.getSlowMachine())
+                ? (configVo.getSlowMachine() + "/") : "";
+        //后视镜
+        String rearViewMirror = StringUtils.isNotBlank(configVo.getRearViewMirror())
+                ? (configVo.getRearViewMirror() + "/") : "";
+        //轮胎规格
+        String tireSize = StringUtils.isNotBlank(configVo.getTireSize())
+                ? (configVo.getTireSize() + "/") : "";
+        //驾驶室规格
+        String specification = StringUtils.isNotBlank(configVo.getSpecification())
+                ? (configVo.getSpecification() + "/") : "";
+        //后桥
+        String rearAxleValue = StringUtils.isNotBlank(configVo.getRearAxleValue())
+                ? (configVo.getRearAxleValue() + "/") : "";
+        //后桥速比
+        String rearAxleRatio = StringUtils.isNotBlank(configVo.getRearAxleRatio())
+                ? (configVo.getRearAxleRatio() + "/") : "";
+        //空调
+        String airConditioner = StringUtils.isNotBlank(configVo.getAirConditioner())
+                ? (configVo.getAirConditioner() + "/") : "";
+
+        String hubMaterial = StringUtils.isNotBlank(configVo.getHubMaterial())
+                ? (configVo.getHubMaterial() + "/") : "";
+
+        String baffleModel = StringUtils.isNotBlank(configVo.getBaffleModel())
+                ? (configVo.getBaffleModel() + "/") : "";
+
+        String suspension = StringUtils.isNotBlank(configVo.getSuspension())
+                ? (configVo.getSuspension() + "/") : "";
+
+        String seat = StringUtils.isNotBlank(configVo.getSeat())
+                ? (configVo.getSeat() + "/") : "";
+
+        String tireCover = StringUtils.isNotBlank(configVo.getTireCover())
+                ? (configVo.getTireCover() + "/") : "";
+
+        String saddle = StringUtils.isNotBlank(configVo.getSaddle())
+                ? (configVo.getSaddle() + "/") : "";
+
+        String wheelbase = StringUtils.isNotBlank(configVo.getWheelbase())
+                ? (configVo.getWheelbase() + "/") : "";
+
+        String bumper = StringUtils.isNotBlank(configVo.getBumper())
+                ? (configVo.getBumper() + "/") : "";
+
+        String configuringBao = StringUtils.isNotBlank(configVo.getConfiguringBao())
+                ? (configVo.getConfiguringBao() + "/") : "";
+
+        String independentSources = StringUtils.isNotBlank(configVo.getIndependentSources())
+                ? (configVo.getIndependentSources() + "/") : "";
+
+        String fuelTank = StringUtils.isNotBlank(configVo.getFuelTank())
+                ? (configVo.getFuelTank() + "/") : "";
+
+        String multimedia = StringUtils.isNotBlank(configVo.getMultimedia())
+                ? (configVo.getMultimedia() + "/") : "";
+
+        String configName = color + slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
+                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+        return configName;
     }
 
 
@@ -2522,7 +2589,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
-            qw.eq("bv.vinNo", pagerQuery.getParams().getName());
+            qw.like("bv.vinNo", pagerQuery.getParams().getName());
         }
         qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
         qw.eq("bv.isDelete", 0);
@@ -2536,4 +2603,43 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return iPage;
     }
+
+    public List<Map<String, String>> getPCInspectionVinList(InspectionVinQuery query) {
+        QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
+        qw.eq("bv.createOrgSid", query.getUseOrgSid());
+        qw.eq("bv.isDelete", 0);
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        List<Map<String, String>> pcInspectionVinList = baseMapper.getPCInspectionVinList(qw);
+        for (Map<String, String> record : pcInspectionVinList) {
+            String addressSid = record.get("addressSid");
+            ScmWarehouseVo data = scmWarehouseFeign.selectByAddressSid(addressSid).getData();
+            record.put("administratorsSid", data.getLibTubeSid());
+            record.put("administratorsName", data.getLibTubeName());
+        }
+        return pcInspectionVinList;
+    }
+
+    public PagerVo<InputVinListVo> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(query);
+        InputVinListQuery params = query.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (params != null) {
+            //根据销售订单查询list
+            List<String> list = busSalesOrderFeign.getList(params.getSaleOrderSid()).getData();
+            if (params.getList().size() > 0) {
+                qw.notIn("bv.vinNo", params.getList());
+            }
+            //根据销售订单sid查询订单是否是排产
+            ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(params.getSaleOrderSid());
+            if (resultBean.getSuccess()) {
+                if ("采购订单".equals(resultBean.getData().getOrderType())) {
+                    qw.in("bv.orderingNo", list);
+                }
+            }
+
+        }
+        IPage<InputVinListVo> pagging = baseMapper.saleOrderVin(page, qw, params.getNames());
+        PagerVo<InputVinListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -52,7 +52,8 @@
                bv.modelConfigSid                       as configSid,
                bd.insideCode,
                bd.vehicleNum,
-               bd.dayNum
+               bd.dayNum,
+               bd.actualMoney
         from base_vehicle_actual_details bd
                  left join base_vehicle bv on bv.vinNo = bd.vinNo
         where bd.vehicleActualSid = #{sid}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicleactualpay;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import org.apache.ibatis.annotations.Mapper;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml

@@ -56,13 +56,15 @@
 
     <select id="getUnsoldBuyout" resultType="com.yxt.anrui.base.api.basevehicleactualsales.AppBaseVehicleActualSalesVo">
         select sid,
-               createBySid                         as userSid,
+               createBySid                         as             userSid,
                taskId,
-               procInstId                          as procInsId,
-               applicationName                     as applyName,
-               DATE_FORMAT(createTime, '%Y-%m-%d') as date,
+               procInstId                          as             procInsId,
+               applicationName                     as             applyName,
+               DATE_FORMAT(createTime, '%Y-%m-%d') as             date,
                reason,
-               money
+               money,
+               case isPay when '1' then '1' when '0' then '0' end payStateKey,
+               case isPay when '1' then '是' when '0' then '否' end payState
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetai
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
+import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.*;
@@ -712,6 +713,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             });
         }
         vo.setRecords(records);
+        //查询付款明细
+        if ("1".equals(vo.getPayStateKey())) {
+            List<BaseVehicleActualPayVo> voPayList = baseVehicleActualPayService.detailsList(sid);
+            List<AppBaseVehicleActualPayVo> payList = Optional.ofNullable(voPayList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppBaseVehicleActualPayVo.class)).collect(Collectors.toList());
+            BigDecimal bigDecimal = new BigDecimal("0");
+            for (AppBaseVehicleActualPayVo v : payList) {
+                bigDecimal = bigDecimal.add(new BigDecimal(v.getPayAccount()));
+            }
+            vo.setPayList(payList);
+            vo.setPayDetailTotal(bigDecimal.toString());
+        }
+
         return rb.success().setData(vo);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@@ -6,6 +6,7 @@ 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.commoncontract.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -85,4 +86,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
 
     @Update("update common_contract set `state`=#{state} where sid=#{businessSid}")
     void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state);
+
+    CommonContract getContractByBusSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -148,4 +148,10 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="getContractByBusSid" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
+        select *
+        from common_contract
+        where busSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@@ -566,4 +566,9 @@ public class CommonContractRest implements CommonContractFeign {
     public ResultBean breakProcess(CommonContractTaskQuery query) {
         return commonContractService.breakProcess(query);
     }
+
+    @Override
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        return commonContractService.getContractByBusSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1652,4 +1652,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
+
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        ResultBean<CommonContract> rb = ResultBean.fireFail();
+        CommonContract commonContract = baseMapper.getContractByBusSid(sid);
+        if(commonContract == null){
+            return rb.setData(new CommonContract());
+        }
+        return rb.success().setData(commonContract);
+    }
 }

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

@@ -29,6 +29,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -198,4 +200,18 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean submitOrder(@RequestBody SubmitSalesOrderDto dto);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/saleOrderInputVin/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<VinVo> saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("采购订单编号list")
+    @GetMapping("/getList/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<List<String>> getList(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("保存销售订单车架号")
+    @PostMapping("/saveSaleOrderInputVin")
+    @ResponseBody
+    ResultBean saveSaleOrderInputVin(@RequestBody VinDto dto);
 }

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

@@ -29,6 +29,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -174,4 +176,19 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean submitOrder(SubmitSalesOrderDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSaleOrderInputVin(VinDto dto) {
+        return null;
+    }
 }

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
@@ -142,4 +143,6 @@ public class AppBusSalesOrderVo implements Vo {
     @ApiModelProperty(value = "需补交订金")
     @JsonSerialize(using = ToStringSerializer.class)
     private String makeUpDeposit;
+    @JsonIgnore
+    private String type;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinDto.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/28 9:39
+ * @Description
+ */
+@Data
+public class VinDto implements Dto {
+    private static final long serialVersionUID = -7317752715537455246L;
+
+    private String saleOrderSid;
+    private List<VinListDto> vinList;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/28 9:40
+ * @Description
+ */
+@Data
+public class VinListDto implements Dto {
+    private static final long serialVersionUID = -8578924480773553156L;
+
+    private String linkNo;
+    private String linkSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:47
+ * @Description
+ */
+@Data
+public class VinListVo implements Vo {
+    private static final long serialVersionUID = 7025918939372350073L;
+
+    private String linkNo;
+    private String linkSid;
+    private Boolean state;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:46
+ * @Description
+ */
+@Data
+public class VinVo implements Vo {
+    private static final long serialVersionUID = -5568525598192648926L;
+
+    private String saleOrderSid;
+
+    private List<VinListVo> vinList;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -43,7 +43,6 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
-import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -107,8 +106,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     SysUserFeign sysUserFeign;
-    @Resource
-    private FinKingDeeFeign finKingDeeFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -565,12 +562,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 baseMapper.updateStateBySid(3, bv.getBusinessSid(), DateUtil.date());
-             /*  try{
-                   SalOutStock s=createSalOutStock(busDeliveredApply);
-                   ResultBean<String> listResultBean = finKingDeeFeign.draftSalOutStock(s);
-               }catch (Exception e){
-
-               }*/
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             return rb.success().setData(resultBean.getData());

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

@@ -40,6 +40,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -159,4 +160,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     int updateFlowFiled(Map<String, Object> map);
 
     int selectNum(String bill);
+
+
+    List<String> getList(String saleOrderSid);
 }

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

@@ -57,7 +57,8 @@
                if(bo.nodeState = '已办结', true, false)  as showContractBtn,
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
-               0                                      as showFinancialBtn
+               0                                      as showFinancialBtn,
+               bo.type
 
 
         FROM bus_sales_order bo
@@ -214,4 +215,10 @@
         from bus_sales_order
         where billNo LIKE concat(#{bill}, '%')
     </select>
+
+    <select id="getList" resultType="java.lang.String">
+        select linkNo
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

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

@@ -31,6 +31,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -242,4 +244,19 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean submitOrder(SubmitSalesOrderDto dto) {
         return busSalesOrderService.submitOrder(dto);
     }
+
+    @Override
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputVin(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        return busSalesOrderService.getList(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean saveSaleOrderInputVin(VinDto dto) {
+        return busSalesOrderService.saveSaleOrderInputVin(dto);
+    }
 }

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

@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery;
 import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
@@ -44,9 +45,11 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
@@ -55,6 +58,10 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
@@ -74,6 +81,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
@@ -1280,6 +1288,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (StringUtils.isBlank(record.getSaleOrderState())) {
                 record.setSaleOrderState("待提交");
             }
+            if ("1".equals(record.getType())) {//现车
+                record.setShowInputBtn(false);
+            } else {
+                //是否有录入车架号按钮
+                //根据sid查询合同是否已办结，若办结，根据选择的采购订单的编号.
+                ResultBean<CommonContract> commonContractResultBean = commonContractFeign.getContractByBusSid(record.getSaleOrderSid());
+                if (commonContractResultBean.getSuccess()) {
+                    CommonContract commonContract = commonContractResultBean.getData();
+                    if ("已办结".equals(commonContract.getNodeState())) {
+                        record.setShowInputBtn(true);
+                    } else {
+                        record.setShowInputBtn(false);
+                    }
+                }
+
+            }
+
 
         }
         PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -2590,4 +2615,74 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 //        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
         return variables;
     }
+
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        ResultBean<VinVo> rb = ResultBean.fireFail();
+        VinVo vinVo = new VinVo();
+        //根据销售订单sid查询车辆台数
+        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(saleOrderSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        List<VinListVo> vinListVos = new ArrayList<>();
+        //根据销售订单查询现车
+        List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        nowCarList.removeAll(Collections.singleton(null));
+        if (!nowCarList.isEmpty()) {
+            for (AppNowCarListVo vv : nowCarList) {
+                VinListVo vinListVo = new VinListVo();
+                vinListVo.setLinkNo(vv.getVin());
+                vinListVo.setLinkSid(vv.getCarSid());
+                //根据车架号查询是否已出库
+                ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
+                if (baseVehicleResultBean.getSuccess()) {
+                    BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
+                    if (vo != null) {
+                        if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
+                            vinListVo.setState(true);
+                        }else{
+                            vinListVo.setState(false);
+                        }
+                    }
+                }
+                vinListVos.add(vinListVo);
+            }
+        } else {
+            AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+            String num = appOrderDetailsVo.getPriceInfo().getNumber();
+            for (int i = 0; i < Integer.valueOf(num).intValue(); i++) {
+                VinListVo vinListVo = new VinListVo();
+                vinListVos.add(vinListVo);
+            }
+        }
+        vinVo.setSaleOrderSid(saleOrderSid);
+        vinVo.setVinList(vinListVos);
+        return rb.success().setData(vinVo);
+    }
+
+
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.getList(saleOrderSid);
+        return rb.success().setData(stringList);
+    }
+
+    public ResultBean saveSaleOrderInputVin(VinDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        List<VinListDto> list = dto.getVinList();
+        //根据销售订单sid查询车架号
+        List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleDetailsVos = busSalesOrderVehicleService.detailsList(dto.getSaleOrderSid());
+        if (busSalesOrderVehicleDetailsVos.size() > 0) {
+            busSalesOrderVehicleService.deleteByOrderSid(dto.getSaleOrderSid());
+        }
+        //新增
+        for (VinListDto v : list) {
+            BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
+            BeanUtil.copyProperties(v, busSalesOrderVehicle);
+            busSalesOrderVehicle.setSalesOrderSid(dto.getSaleOrderSid());
+            busSalesOrderVehicleService.insert(busSalesOrderVehicle);
+        }
+        return rb.success();
+
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java

@@ -14,10 +14,6 @@ import java.util.List;
 @Data
 public class ApPayBill {
 
-      @JsonProperty("FPOSTDATE")
-      @NotBlank
-      //登账日期:FPOSTDATE  (必填项)
-      public String FPOSTDATE;
       @JsonProperty("FDATE")
       @NotBlank
       //业务日期:FDATE  (必填项)

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java

@@ -84,9 +84,9 @@ public class SalOutStock {
         public String Flot;
         /**
          * 货主:FOwnerID  (必填项)
-         */ @JsonProperty("FOwnerID")
+         */ /*@JsonProperty("FOwnerID")
         @NotBlank
-        public String FOwnerID;
+        public String FOwnerID;*/
         /**
          * 仓库:FStockID
          */ @JsonProperty("FStockID")
@@ -94,9 +94,9 @@ public class SalOutStock {
         public String FStockID;
         /**
          * 库存状态:FStockStatusID
-         */ @JsonProperty("FStockStatusID")
+         *//* @JsonProperty("FStockStatusID")
         @NotBlank
-        public String FStockStatusID;
+        public String FStockStatusID;*/
         /**
          * 销售单位:FSalUnitID
          */ @JsonProperty("FSalUnitID")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@@ -18,66 +18,65 @@ public class StkTransferDirect {
     @Data
     public static class FBillEntry{
         /* 调入库存状态:FDestStockStatusId  (必填项)*/
-        @JsonProperty("FDestStockStatusId")
+        /*@JsonProperty("FDestStockStatusId")
         @NotBlank
-        public String FDestStockStatusId;
+        public String FDestStockStatusId;*/
         /* 调入仓库 (必填项)*/
         @JsonProperty("FDestStockId")
         @NotBlank
         public String FDestStockId;
         /*调出库存状态:FSrcStockStatusId  (必填项)*/
-        @JsonProperty("FSrcStockStatusId")
+       /* @JsonProperty("FSrcStockStatusId")
         @NotBlank
-        public String FSrcStockStatusId;
+        public String FSrcStockStatusId;*/
         /*基本单位:FBaseUnitId  (必填项)*/
         //@JsonProperty("FBaseUnitId")
        // @NotBlank
        // public String FBaseUnitId;
         /*调入货主类型:FOwnerTypeId  (必填项)*/
-        @JsonProperty("FOwnerTypeId")
+       /* @JsonProperty("FOwnerTypeId")
         @NotBlank
-        public String FOwnerTypeId;
+        public String FOwnerTypeId;*/
         /* 调出保管者:FKeeperOutId  (必填项)*/
-        @JsonProperty("FKeeperOutId")
+       /* @JsonProperty("FKeeperOutId")
         @NotBlank
-        public String FKeeperOutId;
+        public String FKeeperOutId;*/
         /* 调出货主:FOwnerOutId  (必填项)*/
-        @JsonProperty("FOwnerOutId")
+       /* @JsonProperty("FOwnerOutId")
         @NotBlank
-        public String FOwnerOutId;
+        public String FOwnerOutId;*/
         /*调出批号:FLot*/
-        @JsonProperty("FLot")
+       /* @JsonProperty("FLot")
         @NotBlank
-        public String FLot;
+        public String FLot;*/
         /* 调出货主类型:FOwnerTypeOutId  (必填项)*/
-        @JsonProperty("FOwnerTypeOutId")
+        /*@JsonProperty("FOwnerTypeOutId")
         @NotBlank
-        public String FOwnerTypeOutId;
+        public String FOwnerTypeOutId;*/
+        /* 业务日期 */
+       /* @JsonProperty("FOwnerTypeOutId")
+        @NotBlank
+        public String FBusinessDate;*/
         /*调入批号:FDestLot*/
-        @JsonProperty("FDestLot")
+       /* @JsonProperty("FDestLot")
         @NotBlank
-        public String FDestLot;
+        public String FDestLot;*/
         /* 调入货主:FOwnerId  (必填项)*/
-        @JsonProperty("FOwnerId")
-        @NotBlank
-        public String FOwnerId;
-        /* 调入货主:FOwnerIdHead  (必填项)*/
-        @JsonProperty("FOwnerIdHead")
+       /* @JsonProperty("FOwnerId")
         @NotBlank
-        public String FOwnerIdHead;
+        public String FOwnerId;*/
         /* 调出保管者类型:FKeeperTypeOutId  (必填项)*/
-        @JsonProperty("FKeeperTypeOutId")
+       /* @JsonProperty("FKeeperTypeOutId")
         @NotBlank
-        public String FKeeperTypeOutId;
+        public String FKeeperTypeOutId;*/
         /* 调入保管者:FKeeperId  (必填项)*/
-        @JsonProperty("FKeeperId")
+        /*@JsonProperty("FKeeperId")
         @NotBlank
-        public String FKeeperId;
+        public String FKeeperId;*/
         /* 调入保管者类型:FKeeperTypeId  (必填项)*/
-        @JsonProperty("FKeeperTypeId")
+       /* @JsonProperty("FKeeperTypeId")
         @NotBlank
-        public String FKeeperTypeId;
-
+        public String FKeeperTypeId;*/
         /* 单位:FUnitID  (必填项)*/
        // @JsonProperty("FUnitID")
        // @NotBlank
@@ -91,34 +90,38 @@ public class StkTransferDirect {
         @NotBlank
         public String FSrcStockId;
     }
+    /* 调入货主:FOwnerIdHead  (必填项)*/
+    @JsonProperty("FOwnerIdHead")
+    @NotBlank
+    public String FOwnerIdHead;
    /* 调出库存组织:FStockOutOrgId  (必填项)*/
     @JsonProperty("FStockOutOrgId")
     @NotBlank
     public String FStockOutOrgId;
    /* 调拨类型:FTransferBizType  (必填项)*/
-    @JsonProperty("FTransferBizType")
+    /*@JsonProperty("FTransferBizType")
     @NotBlank
-    public String FTransferBizType;
+    public String FTransferBizType;*/
    /* 调拨方向:FTransferDirect  (必填项)*/
-    @JsonProperty("FTransferDirect")
+   /* @JsonProperty("FTransferDirect")
     @NotBlank
-    public String FTransferDirect;
+    public String FTransferDirect;*/
    /* 调出货主类型:FOwnerTypeOutIdHead  (必填项)*/
-    @JsonProperty("FOwnerTypeOutIdHead")
+    /*@JsonProperty("FOwnerTypeOutIdHead")
     @NotBlank
-    public String FOwnerTypeOutIdHead;
+    public String FOwnerTypeOutIdHead;*/
    /* 调入库存组织:FStockOrgId  (必填项)*/
     @JsonProperty("FStockOrgId")
     @NotBlank
     public String FStockOrgId;
    /* 调入货主类型:FOwnerTypeIdHead  (必填项)*/
-    @JsonProperty("FOwnerTypeIdHead")
+    /*@JsonProperty("FOwnerTypeIdHead")
     @NotBlank
-    public String FOwnerTypeIdHead;
+    public String FOwnerTypeIdHead;*/
    /* 单据类型:FBillTypeID  (必填项)*/
-    @JsonProperty("FBillTypeID")
+    /*@JsonProperty("FBillTypeID")
     @NotBlank
-    public String FBillTypeID;
+    public String FBillTypeID;*/
    /* 日期:FDate  (必填项)*/
     @JsonProperty("FDate")
     @NotBlank
@@ -136,27 +139,27 @@ public class StkTransferDirect {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date=new Date();
         /* 单据类型:FBillTypeID  (必填项)*/
-        stkTransferDirect.setFBillTypeID("ZJDB01_SYS");
+        //stkTransferDirect.setFBillTypeID("ZJDB01_SYS");
         /* 日期:FDate  (必填项)*/
         stkTransferDirect.setFDate(sdf.format(date));
         /* 调出库存组织:FStockOutOrgId  (必填项)*/
         stkTransferDirect.setFStockOutOrgId("101");
         /* 调出货主类型:FOwnerTypeOutIdHead  (必填项)*/
-        stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg");
+        //stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg");
         /* 调拨类型:FTransferBizType  (必填项)*/
-        stkTransferDirect.setFTransferBizType("InnerOrgTransfer");
+       // stkTransferDirect.setFTransferBizType("InnerOrgTransfer");
         /* 调拨方向:FTransferDirect  (必填项)*/
-        stkTransferDirect.setFTransferDirect("GENERAL");
+       // stkTransferDirect.setFTransferDirect("GENERAL");
         /* 调入库存组织:FStockOrgId  (必填项)*/
         stkTransferDirect.setFStockOrgId("101");
         /* 调入货主类型:FOwnerTypeIdHead  (必填项)*/
-        stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg");
+        //stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg");
         List<StkTransferDirect.FBillEntry> fBillEntry=new ArrayList<>();
         StkTransferDirect.FBillEntry fbe=new StkTransferDirect.FBillEntry();
         /*调入批号:FDestLot*/
-        fbe.setFDestLot("1234567890");
+       // fbe.setFDestLot("1234567890");
         /*调出批号:FLot*/
-        fbe.setFLot("1234567890");
+       // fbe.setFLot("1234567890");
         /*基本单位:FBaseUnitId  (必填项)*/
         //fbe.setFBaseUnitId("liang");
         /* 调入仓库:FDestStockId  (必填项)*/
@@ -167,27 +170,27 @@ public class StkTransferDirect {
         fbe.setFMaterialId(" JX091054");
 
         /* 调入库存状态:FDestStockStatusId  (必填项)*/
-        fbe.setFDestStockStatusId("KCZT01_SYS");
+       // fbe.setFDestStockStatusId("KCZT01_SYS");
         /* 调入货主类型:FOwnerTypeId  (必填项)*/
-        fbe.setFOwnerTypeId("BD_OwnerOrg");
+       // fbe.setFOwnerTypeId("BD_OwnerOrg");
         /* 调入货主:FOwnerId  (必填项)*/
-        fbe.setFOwnerId("101");
+       // fbe.setFOwnerId("101");
         /* 调入货主:FOwnerId  (必填项)*/
-        fbe.setFOwnerIdHead("101");
+       // fbe.setFOwnerIdHead("101");
         /* 调出保管者:FKeeperOutId  (必填项)*/
-        fbe.setFKeeperOutId("101");
+       // fbe.setFKeeperOutId("101");
         /* 调出货主:FOwnerOutId  (必填项)*/
-        fbe.setFOwnerOutId("101");
+       // fbe.setFOwnerOutId("101");
         /* 调出货主类型:FOwnerTypeOutId  (必填项)*/
-        fbe.setFOwnerTypeOutId("BD_OwnerOrg");
+       // fbe.setFOwnerTypeOutId("BD_OwnerOrg");
         /* 调出保管者类型:FKeeperTypeOutId  (必填项)*/
-        fbe.setFKeeperTypeOutId("BD_KeeperOrg");
+      //  fbe.setFKeeperTypeOutId("BD_KeeperOrg");
         /* 调入保管者:FKeeperId  (必填项)*/
-        fbe.setFKeeperId("101");
+       // fbe.setFKeeperId("101");
         /* 调入保管者类型:FKeeperTypeId  (必填项)*/
-        fbe.setFKeeperTypeId("BD_KeeperOrg");
+       // fbe.setFKeeperTypeId("BD_KeeperOrg");
         /*调出库存状态:FSrcStockStatusId  (必填项)*/
-        fbe.setFSrcStockStatusId("KCZT01_SYS");
+      //  fbe.setFSrcStockStatusId("KCZT01_SYS");
         /* 调出仓库:FSrcStockId  (必填项)*/
         fbe.setFSrcStockId("CK001");
         fBillEntry.add(fbe);

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

@@ -182,7 +182,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private ApPayBill createApPayBill(FinPaymentrecord finPaymentrecord) {
         ApPayBill apPayBill = new ApPayBill();
         //登账日期
-        apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+       // apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
         //业务日期
         apPayBill.setFDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
         //收款单位

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockCastToKingDeeBillFields.java

@@ -50,6 +50,7 @@ public class SalOutStockCastToKingDeeBillFields {
             log.info("fEntity_:{}",fEntity_);
             Map<String,String> params=vehicleList.get(i);
             Map<String,String> map_fEntityDetail_=new HashMap<>();
+            map_fEntityDetail_.put("FSaleOrgId",map_fEntityModel_.get("FSaleOrgId"));
             for (Map.Entry<String, String> entry : params.entrySet()) {
                 map_fEntityDetail_.put(entry.getKey(),entry.getValue());
             }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@@ -15,13 +15,13 @@
     "FNumber": "@KD_Flot"
   },
   "FOwnerID": {
-    "FNumber": "@KD_FOwnerID"
+    "FNumber": "@KD_FSaleOrgId"
   },
   "FStockID": {
     "FNumber": "@KD_FStockID"
   },
   "FStockStatusID": {
-    "FNumber": "@KD_FStockStatusID"
+    "FNumber": "KCZT01_SYS"
   },
   "FSalUnitID": {
     "FNumber": "liang"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java

@@ -51,6 +51,9 @@ public class StkTransferDirectCastToKingDeeBillFields {
             log.info("FBillEntry_:{}",fBillEntry_);
             Map<String,String> params=vehicleList.get(i);
             Map<String,String> map_fEntityDetail_=new HashMap<>();
+            map_fEntityDetail_.put("FStockOutOrgId",map_fEntityModel_.get("FStockOutOrgId"));
+            map_fEntityDetail_.put("FStockOrgId",map_fEntityModel_.get("FStockOrgId"));
+            map_fEntityDetail_.put("FDate",map_fEntityModel_.get("FDate"));
             for (Map.Entry<String, String> entry : params.entrySet()) {
                 map_fEntityDetail_.put(entry.getKey(),entry.getValue());
             }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json

@@ -6,10 +6,10 @@
     "FNumber": "liang"
   },
   "FDestLot":{
-    "FNumber": "@KD_FDestLot"
+    "FNumber": ""
   },
   "FLot":  {
-    "FNumber": "@KD_FLot"
+    "FNumber": ""
   },
   "FQty": 1.0,
   "FSrcStockId": {
@@ -19,32 +19,32 @@
     "FNumber": "@KD_FDestStockId"
   },
   "FSrcStockStatusId": {
-    "FNumber": "@KD_FSrcStockStatusId"
+    "FNumber": "KCZT01_SYS"
   },
   "FDestStockStatusId": {
-    "FNumber": "@KD_FDestStockStatusId"
+    "FNumber": "KCZT01_SYS"
   },
-  "FBusinessDate": "2022-08-31 00:00:00",
-  "FOwnerTypeOutId": "@KD_FOwnerTypeOutId",
+  "FBusinessDate": "@KD_FDate",
+  "FOwnerTypeOutId": "BD_OwnerOrg",
   "FOwnerOutId": {
-    "FNumber": "@KD_FOwnerOutId"
+    "FNumber": "@KD_FStockOutOrgId"
   },
-  "FOwnerTypeId": "@KD_FOwnerTypeId",
+  "FOwnerTypeId": "BD_OwnerOrg",
   "FOwnerId": {
-    "FNumber": "@KD_FOwnerId"
+    "FNumber": "@KD_FStockOrgId"
   },
   "FBaseUnitId": {
     "FNumber": "liang"
   },
   "FBaseQty": 1.0,
   "FISFREE": false,
-  "FKeeperTypeId": "@KD_FKeeperTypeId",
+  "FKeeperTypeId": "BD_KeeperOrg",
   "FKeeperId": {
-    "FNumber": "@KD_FKeeperId"
+    "FNumber": "@KD_FStockOrgId"
   },
-  "FKeeperTypeOutId": "@KD_FKeeperTypeOutId",
+  "FKeeperTypeOutId": "BD_KeeperOrg",
   "FKeeperOutId": {
-    "FNumber": "@KD_FKeeperOutId"
+    "FNumber": "@KD_FStockOutOrgId"
   },
   "FDestMaterialId": {
     "FNUMBER": " JX091054"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json

@@ -1,42 +1,42 @@
 {
   "FID": 0,
   "FBillTypeID": {
-    "FNUMBER": "@KD_FBillTypeID"
+    "FNUMBER": "ZJDB01_SYS"
   },
   "FBizType": "NORMAL",
-  "FTransferDirect": "@KD_FTransferDirect",
-  "FTransferBizType": "@KD_FTransferBizType",
+  "FTransferDirect": "GENERAL",
+  "FTransferBizType": "调车",
   "FSettleOrgId": {
-    "FNumber": "101"
+    "FNumber": ""
   },
   "FSaleOrgId": {
-    "FNumber": "101"
+    "FNumber": ""
   },
   "FStockOutOrgId": {
     "FNumber": "@KD_FStockOutOrgId"
   },
-  "FOwnerTypeOutIdHead": "@KD_FOwnerTypeOutIdHead",
+  "FOwnerTypeOutIdHead": "BD_OwnerOrg",
   "FOwnerOutIdHead": {
-    "FNumber": "101"
+    "FNumber": ""
   },
   "FStockOrgId": {
     "FNumber": "@KD_FStockOrgId"
   },
   "FIsIncludedTax": true,
   "FIsPriceExcludeTax": true,
-  "FOwnerTypeIdHead": "@KD_FOwnerTypeIdHead",
+  "FOwnerTypeIdHead": "BD_OwnerOrg",
   "FSETTLECURRID": {
     "FNUMBER": "PRE001"
   },
   "FOwnerIdHead": {
-    "FNumber": "101"
+    "FNumber": "@KD_FStockOrgId"
   },
-  "FDate": "2022-08-31 00:00:00",
+  "FDate": "@KD_FDate",
   "FBaseCurrId": {
     "FNumber": "PRE001"
   },
   "FCustID": {
-    "FNUMBER": "GYRHHR002529"
+    "FNUMBER": ""
   },
   "FBillEntry": []
 }

anrui-portal/anrui-portal-api/pom.xml

@@ -32,9 +32,12 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommon.java

@@ -20,4 +20,6 @@ public class DictCommon extends BaseEntity {
     private String dictValue;
     @ApiModelProperty(value = "数据项的父级sid")
     private String parentSid;
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonDto.java

@@ -30,4 +30,7 @@ public class DictCommonDto implements Dto {
     @ApiModelProperty(value = "数据项的父级sid", required = true)
     @NotBlank(message = "数据项的父级sid不能为空")
     private String parentSid;
+
+    @ApiModelProperty(value = "分组名称", required = true)
+    private String groupName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonVo.java

@@ -26,4 +26,7 @@ public class DictCommonVo implements Vo {
     private String dictValue;
     @ApiModelProperty(value = "父级sid：0为第一级")
     private String parentSid;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMapping.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMapping <br/>
+ * Description: sys_mapping. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射", description = "数据映射")
+@TableName("sys_mapping")
+public class SysMapping extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo <br/>
+ * Description: sys_mapping 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射 视图数据详情", description = "数据映射 视图数据详情")
+public class SysMappingDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto <br/>
+ * Description: sys_mapping 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射 数据传输对象", description = "数据映射 数据传输对象")
+public class SysMappingDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("用户sid")
+    private String userSid; // 数据字典sid
+	@ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeign <br/>
+ * Description: sys_mapping. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据映射")
+@FeignClient(
+        contextId = "anrui-portal-SysMapping",
+        name = "anrui-portal",
+        path = "v1/sysmapping",
+        fallback = SysMappingFeignFallback.class)
+public interface SysMappingFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<SysMappingVo>> listPage(@RequestBody PagerQuery<SysMappingQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody SysMappingDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<SysMappingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("新增映射")
+    @PostMapping("/saveMappingList")
+    @ResponseBody
+    public ResultBean saveMappingList(@RequestBody List<SysMappingDto> dto);
+
+    @ApiOperation("根据条件查询详情")
+    @PostMapping("/selectMappingInfo")
+    @ResponseBody
+    public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeignFallback <br/>
+ * Description: sys_mapping. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysMappingFeignFallback implements SysMappingFeign {
+
+	@Override
+	public ResultBean<PagerVo<SysMappingVo>> listPage(PagerQuery<SysMappingQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口sysmapping/sysmapping/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(SysMappingDto dto){
+		return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<SysMappingDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口sysmapping/sysmapping/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean saveMappingList(List<SysMappingDto> dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
+		return null;
+	}
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysMappingInfoQuery implements Query {
+    private static final long serialVersionUID = 5179141159925489016L;
+
+    @ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+
+    @ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+
+    @ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+
+    @ApiModelProperty("数据字典类别编码")
+    private String dictTypeCode; // 数据字典类别编码
+
+    @ApiModelProperty("数据key")
+    private String dictKey; // 数据key
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.portal.api.sysmapping;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysMappingInfoVo implements Vo {
+
+
+    private static final long serialVersionUID = -4909774998558087805L;
+
+    @ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+    @ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+    @ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+    @ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+    @ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+    @ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+    @ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingQuery <br/>
+ * Description: sys_mapping 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件")
+public class SysMappingQuery implements Query {
+
+    private static final long serialVersionUID = -546734185535363676L;
+    @ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+    @ApiModelProperty("数据字典类别编码")
+    private String dictTypeCode; // 数据字典类别编码
+    @ApiModelProperty("数据字典类别名称")
+    private String dictTypeName; // 数据字典类别名称
+    @ApiModelProperty("数据key")
+    private String dictKey; // 数据key
+    @ApiModelProperty("数据value")
+    private String dictValue; // 数据value
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysmapping;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo <br/>
+ * Description: sys_mapping 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据映射 视图数据对象", description = "数据映射 视图数据对象")
+public class SysMappingVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("数据字典sid")
+    private String dictSid; // 数据字典sid
+	@ApiModelProperty("映射来源，如CWXT等")
+    private String map_sourceKey; // 映射来源，如CWXT等
+	@ApiModelProperty("映射来源，如财务系统等")
+    private String map_sourceValue; // 映射来源，如财务系统等
+	@ApiModelProperty("映射实体，如付款单")
+    private String map_object; // 映射实体，如付款单
+	@ApiModelProperty("映射项目类别，如应付类别")
+    private String map_item; // 映射项目类别，如应付类别
+	@ApiModelProperty("项目key，如002")
+    private String map_itemKey; // 项目key，如002
+	@ApiModelProperty("项目value，如外采")
+    private String map_itemValue; // 项目value，如外采
+
+    @ApiModelProperty("数据字典类别编码")
+    private String dictTypeCode; // 数据字典类别编码
+    @ApiModelProperty("数据字典类别名称")
+    private String dictTypeName; // 数据字典类别名称
+    @ApiModelProperty("数据key")
+    private String dictKey; // 数据key
+    @ApiModelProperty("数据value")
+    private String dictValue; // 数据value
+}

anrui-portal/anrui-portal-biz/pom.xml

@@ -84,6 +84,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml

@@ -16,7 +16,7 @@
     </select>
 
     <select id="pageList" resultType="com.yxt.anrui.portal.api.dictcommon.DictCommonVo">
-        SELECT dc.dictValue, dc.dictType, dc.dictKey, dc.sid, dc.parentSid
+        SELECT dc.dictValue, dc.dictType, dc.dictKey, dc.sid, dc.parentSid,dc.groupName
         FROM dict_common dc
                 ${ew.customSqlSegment}
     </select>
@@ -30,7 +30,8 @@
         SELECT sid,
                dictKey,
                dictType,
-               dictValue
+               dictValue,
+               groupName
         FROM dict_common
         WHERE dictType = #{type}
           AND dictkey = #{key}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysmapping;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
+import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.portal.api.sysmapping.SysMapping;
+import com.yxt.anrui.portal.api.sysmapping.SysMappingVo;
+
+import java.util.List;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingMapper <br/>
+ * Description: sys_mapping. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysMappingMapper extends BaseMapper<SysMapping> {
+
+    //@Update("update sys_mapping set name=#{msg} where id=#{id}")
+    //IPage<SysMappingVo> voPage(IPage<SysMapping> page, @Param(Constants.WRAPPER) QueryWrapper<SysMapping> qw);
+
+    IPage<SysMappingVo> selectPageVo(IPage<SysMappingQuery> page, @Param(Constants.WRAPPER) QueryWrapper<SysMappingVo> qw);
+
+    List<SysMappingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMapping> qw);
+
+    @Select("select * from sys_mapping")
+    List<SysMappingVo> selectListVo();
+
+    SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper<SysMappingInfoVo> qw);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.portal.biz.sysmapping.SysMappingMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingVo">
+        SELECT
+        sm.sid,
+        sm.dictSid,
+        sm.map_sourceKey,
+        sm.map_sourceValue,
+        sm.map_object,
+        sm.map_item,
+        sm.map_itemKey,
+        sm.map_itemValue,
+        dc.dictKey,
+        dc.dictValue,
+        dt.dictTypeCode,
+        dt.dictTypeName
+        FROM
+        sys_mapping sm
+        LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
+        LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingVo">
+        SELECT * FROM sys_mapping
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectMappingInfo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo">
+        SELECT
+        sm.dictSid,
+        sm.map_sourceKey,
+        sm.map_sourceValue,
+        sm.map_object,
+        sm.map_item,
+        sm.map_itemKey,
+        sm.map_itemValue
+        FROM
+        sys_mapping sm
+        LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
+        LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+</mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysmapping;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysmapping.*;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingRest <br/>
+ * Description: sys_mapping. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "sys_mapping")
+@RestController("com.yxt.anrui.portal.biz.sysmapping.SysMappingRest")
+@RequestMapping("v1/sysmapping")
+public class SysMappingRest implements SysMappingFeign {
+
+    @Autowired
+    private SysMappingService sysMappingService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMappingVo>> listPage(@RequestBody PagerQuery<SysMappingQuery> pq) {
+        PagerVo<SysMappingVo> page = new PagerVo<>();
+        IPage<SysMappingVo> iPage = sysMappingService.listPageVo(pq);
+        PagerVo<SysMappingVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<SysMappingVo>>().success().setData(pagerVo);
+
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysMappingDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<SysMappingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveMappingList(List<SysMappingDto> dto) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMappingService.saveMappingList(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
+        ResultBean<SysMappingInfoVo> rb = ResultBean.fireFail();
+        SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query);
+        return rb.success().setData(vo);
+    }
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@@ -0,0 +1,166 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysmapping;
+
+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.portal.api.sysmapping.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: sysmapping(sysmapping) <br/>
+ * File: SysMappingService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingService <br/>
+ * Description: sys_mapping 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-26 10:50:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysMapping> {
+    private QueryWrapper<SysMapping> createQueryWrapper(SysMappingQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysMapping> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public IPage<SysMappingVo> listPageVo(PagerQuery<SysMappingQuery> pq) {
+        IPage<SysMappingQuery> page = PagerUtil.queryToPage(pq);
+        QueryWrapper<SysMappingVo> qw = queryWrapper(pq.getParams());
+        IPage<SysMappingVo> iPage = baseMapper.selectPageVo(page, qw);
+        return iPage;
+    }
+
+    public QueryWrapper<SysMappingVo> queryWrapper(SysMappingQuery query) {
+        QueryWrapper<SysMappingVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
+            qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
+        }
+        if (StringUtils.isNotBlank(query.getMap_sourceValue())) {
+            qw.like("sm.map_sourceValue", query.getMap_sourceValue());
+        }
+        if (StringUtils.isNotBlank(query.getMap_object())) {
+            qw.like("sm.map_object", query.getMap_object());
+        }
+        if (StringUtils.isNotBlank(query.getMap_item())) {
+            qw.like("sm.map_item", query.getMap_item());
+        }
+        if (StringUtils.isNotBlank(query.getMap_itemKey())) {
+            qw.eq("sm.map_itemKey", query.getMap_itemKey());
+        }
+        if (StringUtils.isNotBlank(query.getMap_itemValue())) {
+            qw.like("sm.map_itemValue", query.getMap_itemValue());
+        }
+        if (StringUtils.isNotBlank(query.getDictTypeCode())) {
+            qw.eq("dc.dictKey", query.getDictTypeCode());
+        }
+        if (StringUtils.isNotBlank(query.getDictTypeName())) {
+            qw.like("dc.dictValue", query.getDictTypeName());
+        }
+        if (StringUtils.isNotBlank(query.getDictKey())) {
+            qw.eq("dt.dictTypeCode", query.getDictKey());
+        }
+        if (StringUtils.isNotBlank(query.getDictValue())) {
+            qw.like("dt.dictTypeName", query.getDictValue());
+        }
+        return qw;
+    }
+
+
+    public void saveOrUpdateDto(SysMappingDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(SysMappingDto dto) {
+        SysMapping entity = new SysMapping();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(SysMappingDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        SysMapping entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public SysMappingDetailsVo fetchDetailsVoBySid(String sid) {
+        SysMapping entity = fetchBySid(sid);
+        SysMappingDetailsVo vo = new SysMappingDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void saveMappingList(List<SysMappingDto> dto) {
+        for (SysMappingDto sysMappingDto : dto) {
+            SysMapping entity = new SysMapping();
+            BeanUtil.copyProperties(sysMappingDto, entity, "sid");
+            entity.setCreateBySid(sysMappingDto.getUserSid());
+            save(entity);
+        }
+    }
+
+    public SysMappingInfoVo selectMappingInfo(SysMappingInfoQuery query) {
+        QueryWrapper<SysMappingInfoVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
+            qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
+        }
+        if (StringUtils.isNotBlank(query.getMap_object())) {
+            qw.eq("sm.map_object", query.getMap_object());
+        }
+        if (StringUtils.isNotBlank(query.getMap_item())) {
+            qw.eq("sm.map_item", query.getMap_item());
+        }
+        if (StringUtils.isNotBlank(query.getDictTypeCode())) {
+            qw.eq("dt.dictTypeCode", query.getDictTypeCode());
+        }
+        if (StringUtils.isNotBlank(query.getDictKey())) {
+            qw.eq("dc.dictKey", query.getDictKey());
+        }
+        SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw);
+        return vo;
+    }
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.biz.sysuser.wx;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.auth0.jwt.JWT;
@@ -24,7 +25,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import sun.misc.BASE64Encoder;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -529,7 +529,7 @@ public class WxSysUserRest implements WxSysUserFeign {
         Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm());
         mac.init(sKey);
         byte[] hash = mac.doFinal(signStr.getBytes("UTF-8"));
-        String sig = new BASE64Encoder().encode(hash);
+        String sig = Base64.encode(hash);
 
         String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\"";
         return auth;

anrui-portal/anrui-portal-biz/src/test/java/com/yxt/anrui/portal/test/controller/TestController.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.test.controller;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import sun.misc.BASE64Encoder;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -218,7 +218,7 @@ public class TestController {
         Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm());
         mac.init(sKey);
         byte[] hash = mac.doFinal(signStr.getBytes("UTF-8"));
-        String sig = new BASE64Encoder().encode(hash);
+        String sig = Base64.encode(hash);
 
         String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\"";
         return auth;

anrui-scm/anrui-scm-api/pom.xml

@@ -27,6 +27,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebate.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表", description = "回款返利表")
+@TableName("scm_collection_rebate")
+public class ScmCollectionRebate extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo <br/>
+ * Description: 回款返利表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 视图数据详情", description = "回款返利表 视图数据详情")
+public class ScmCollectionRebateDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto <br/>
+ * Description: 回款返利表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 数据传输对象", description = "回款返利表 数据传输对象")
+public class ScmCollectionRebateDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebate",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebate",
+        fallback = ScmCollectionRebateFeignFallback.class)
+public interface ScmCollectionRebateFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+import com.yxt.common.core.query.PagerQuery;
+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: ScmCollectionRebateFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeignFallback <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateVo>> listPage(PagerQuery<ScmCollectionRebateQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebate/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebate/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery <br/>
+ * Description: 回款返利表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件")
+public class ScmCollectionRebateQuery implements Query {
+
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+    @ApiModelProperty(value = "创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty(value = "创建结束日期")
+    private String createEndTime;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo <br/>
+ * Description: 回款返利表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 视图数据对象", description = "回款返利表 视图数据对象")
+public class ScmCollectionRebateVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表", description = "回款返利核对申请表")
+@TableName("scm_collectionrebate_checkapply")
+public class ScmCollectionrebateCheckapply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo <br/>
+ * Description: 回款返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 视图数据详情", description = "回款返利核对申请表 视图数据详情")
+public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto <br/>
+ * Description: 回款返利核对申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 数据传输对象", description = "回款返利核对申请表 数据传输对象")
+public class ScmCollectionrebateCheckapplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利核对申请表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionrebateCheckapply",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatecheckapply",
+        fallback = ScmCollectionrebateCheckapplyFeignFallback.class)
+public interface ScmCollectionrebateCheckapplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+import com.yxt.common.core.query.PagerQuery;
+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: ScmCollectionrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeignFallback <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollectionrebateCheckapplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionrebateCheckapplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery <br/>
+ * Description: 回款返利核对申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件")
+public class ScmCollectionrebateCheckapplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo <br/>
+ * Description: 回款返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 视图数据对象", description = "回款返利核对申请表 视图数据对象")
+public class ScmCollectionrebateCheckapplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetail.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表", description = "回款返利核对申请表_返利列表")
+@TableName("scm_collectionrebate_checkapplydetail")
+public class ScmCollectionrebateCheckapplydetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo <br/>
+ * Description: 回款返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 视图数据详情", description = "回款返利核对申请表_返利列表 视图数据详情")
+public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto <br/>
+ * Description: 回款返利核对申请表_返利列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 数据传输对象", description = "回款返利核对申请表_返利列表 数据传输对象")
+public class ScmCollectionrebateCheckapplydetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利核对申请表_返利列表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionrebateCheckapplydetail",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatecheckapplydetail",
+        fallback = ScmCollectionrebateCheckapplydetailFeignFallback.class)
+public interface ScmCollectionrebateCheckapplydetailFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+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: ScmCollectionrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeignFallback <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionrebateCheckapplydetailVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery <br/>
+ * Description: 回款返利核对申请表_返利列表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 查询条件", description = "回款返利核对申请表_返利列表 查询条件")
+public class ScmCollectionrebateCheckapplydetailQuery implements Query {
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo <br/>
+ * Description: 回款返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 视图数据对象", description = "回款返利核对申请表_返利列表 视图数据对象")
+public class ScmCollectionrebateCheckapplydetailVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWith.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表", description = "回款返利预提表")
+@TableName("scm_collection_rebate_with")
+public class ScmCollectionRebateWith extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo <br/>
+ * Description: 回款返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 视图数据详情", description = "回款返利预提表 视图数据详情")
+public class ScmCollectionRebateWithDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto <br/>
+ * Description: 回款返利预提表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 数据传输对象", description = "回款返利预提表 数据传输对象")
+public class ScmCollectionRebateWithDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利预提表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebateWith",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatewith",
+        fallback = ScmCollectionRebateWithFeignFallback.class)
+public interface ScmCollectionRebateWithFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateWithVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateWithDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+import com.yxt.common.core.query.PagerQuery;
+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: ScmCollectionRebateWithFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeignFallback <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateWithFeignFallback implements ScmCollectionRebateWithFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateWithVo>> listPage(PagerQuery<ScmCollectionRebateWithQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateWithDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery <br/>
+ * Description: 回款返利预提表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 查询条件", description = "回款返利预提表 查询条件")
+public class ScmCollectionRebateWithQuery implements Query {
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo <br/>
+ * Description: 回款返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 视图数据对象", description = "回款返利预提表 视图数据对象")
+public class ScmCollectionRebateWithVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表", description = "回款返利预提申请表")
+@TableName("scm_collection_rebate_with_apply")
+public class ScmCollectionRebateWithApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo <br/>
+ * Description: 回款返利预提申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 视图数据详情", description = "回款返利预提申请表 视图数据详情")
+public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto <br/>
+ * Description: 回款返利预提申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 数据传输对象", description = "回款返利预提申请表 数据传输对象")
+public class ScmCollectionRebateWithApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利预提申请表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebateWithApply",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatewithapply",
+        fallback = ScmCollectionRebateWithApplyFeignFallback.class)
+public interface ScmCollectionRebateWithApplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+import com.yxt.common.core.query.PagerQuery;
+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: ScmCollectionRebateWithApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeignFallback <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionRebateWithApplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(PagerQuery<ScmCollectionRebateWithApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateWithApplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery <br/>
+ * Description: 回款返利预提申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 查询条件", description = "回款返利预提申请表 查询条件")
+public class ScmCollectionRebateWithApplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}