Merge remote-tracking branch 'origin/master'

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

@@ -239,4 +239,10 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     CrmCustomerTemp selectCrm(String affiliatedOrgSid);
 
     String selectByMcSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
+
+    String selectByBusSid1(String sid);
+
+    String selectByBusSid1D(String sid);
+
+    String selectByBusVinSid1(String sid);
 }

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

@@ -636,4 +636,48 @@
     <select id="selectByMcSid" resultType="java.lang.String">
         select sid from anrui_base.base_vehmodel_config where useOrgSid = #{useOrgSid} and modelSid = #{modelSid} and configurationItemsSid = #{configSid} order by id desc limit 1
     </select>
+
+    <select id="selectByBusSid1" resultType="java.lang.String">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
+        FROM anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM anrui_fin.fin_funds_carried_forward_veh f
+        JOIN anrui_fin.fin_funds_carried_forward_apply fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        and ff.busVinSid = #{busVinSid} and ff.receivablesName = '首付款及费用'
+        GROUP BY d.`sid`) d
+    </select>
+
+    <select id="selectByBusSid1D" resultType="java.lang.String">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
+        FROM anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM anrui_fin.fin_funds_carried_forward_veh f
+        JOIN anrui_fin.fin_funds_carried_forward_apply fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        and ff.busVinSid = #{busVinSid} and ff.receivablesName = '订金'
+        GROUP BY d.`sid`) d
+    </select>
+
+    <select id="selectByBusVinSid1" resultType="java.lang.String">
+        select ifnull(sum(reveivableMoney),0)
+        from anrui_fin.fin_uncollected_receivables_detailed
+        where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
+    </select>
 </mapper>

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

@@ -5841,12 +5841,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         dtoList.add(baseVehicleStateDto);
                     }*/
                     //已认款完成
+                   /* BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                    baseVehicleStateDto.setBusSid(vinList.get(i).getSid());
+                    dtoList.add(baseVehicleStateDto);*/
+                    String subscribute = baseMapper.selectByBusSid1(vinList.get(i).getSid());
+                    String subscributeD = baseMapper.selectByBusSid1D(vinList.get(i).getSid());
+                    String receiableMoney = baseMapper.selectByBusVinSid1(vinList.get(i).getSid());
+                    BigDecimal subscributeAll = new BigDecimal(subscribute).add(new BigDecimal(subscributeD));
+                    if (subscributeAll.compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
                         BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                         baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
                         baseVehicleStateDto.setBusSid(vinList.get(i).getSid());
                         dtoList.add(baseVehicleStateDto);
                     }
                 }
+            }
             //==============================修改车辆的持久状态组装数据
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -1621,7 +1621,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
                 if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
-                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                  /*  String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
                     String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
                     if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
                         //已认款完成
@@ -1635,6 +1635,23 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
                         baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
                         dtoList.add(baseVehicleStateDto);
+                    }*/
+                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String subscributeD = baseMapper.selectByBusSid1D(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    BigDecimal subscributeAll = new BigDecimal(subscribute).add(new BigDecimal(subscributeD));
+                    if (subscributeAll.compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
                     }
                 }else{
                     //查询该车的所有认款，是否都已认完

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -325,7 +325,7 @@
     <select id="selectByBusVinSid1" resultType="java.lang.String">
         select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
-        where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
+        where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
     </select>
 
     <select id="selectListByBusVinSid"
@@ -335,7 +335,7 @@
 
     <select id="selectListByBusVinSid1"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
-        select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
+        select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
     </select>
 
     <select id="selectListByBusVinSid2"

doc/databases/统计报表更新.sql

@@ -78,7 +78,10 @@ BEGIN
                      where (si.nodeState != '已办结' and si.nodeState != '终止')
                        and bo.isDelete <> 1
                        and bo.applyTypeKey = '001'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo  LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
                      union all
                      select ifnull(sum(bo.platformNo), 0) as scount,
@@ -93,7 +96,11 @@ BEGIN
                      where bo.isDelete <> 1
                        and LENGTH(offlineDate) = 0
                        and bo.orderStatus != '已作废'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                                                        LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by bo.createOrgSid, bd.vehicleSid, bd.configSid
                      union all
                      select ifnull(si.num, 0) as scount,
@@ -136,12 +143,36 @@ BEGIN
                          FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
                                   LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
                          WHERE LENGTH(bb.nodeState) > 0
-                           AND bb.nodeState != '终止'
+                           AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
                          group by bbbbo.linkSid
                      ) ab ON ab.linkSid = bo.sid
                      WHERE (si.nodeState != '已办结' AND si.nodeState != '终止')
                        AND bo.isDelete <> 1
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
+                     UNION ALL
+                     SELECT
+                         bo.useOrgSid,
+                         bd.vehicleSid modelSid,
+                         bd.configSid,
+                         bo.sid,
+                         ifnull(ab.counts, 0) as scount
+                     FROM
+                         anrui_base.bus_vehicle_order bo
+                             LEFT JOIN anrui_base.bus_vehicle_apply_detail bd ON bd.sid = bo.purchaseApplyMediumModelSid
+                             LEFT JOIN anrui_base.base_vehicle_model bbm ON bbm.sid = bd.vehicleSid
+                             LEFT JOIN (
+                             SELECT bbbbo.linkSid,
+                                    ifnull(count(bbbbo.linkSid), 0) as counts
+                             FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                      LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                             WHERE LENGTH(bb.nodeState) > 0
+                               AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                             group by bbbbo.linkSid
+                         ) ab ON ab.linkSid = bo.sid
+                     WHERE
+                             bo.isDelete <> 1
+                       AND LENGTH( offlineDate ) = 0
+                       AND bo.orderStatus != '已作废' group by bo.createOrgSid,bd.vehicleSid,bd.configSid
                  ) as v
             GROUP BY v.`useOrgSid`,
                      v.`modelSid`,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -45,5 +45,11 @@ public class AsBusrepairInventorybillRest {
         return asBusrepairInventorybillService.outBill(dto);
     }
 
+    @PostMapping("quitBill")
+    @ApiOperation("退库")
+    ResultBean quitBill(@RequestBody AsBusrepairInventorybillDto dto){
+        return asBusrepairInventorybillService.quitBill(dto);
+    }
+
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -118,4 +118,21 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         wmsInventoryBillFeign.outStorage(wmsInventoryBillDto);
         return rb.success();
     }
+
+    public ResultBean quitBill(AsBusrepairInventorybillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = saveOrUdateBill(dto).getData();
+        AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);
+        WmsInventoryBillDto wmsInventoryBillDto = new WmsInventoryBillDto();
+        BeanUtil.copyProperties(asBusrepairInventorybill, wmsInventoryBillDto, "sid", "id");
+        List<WmsInventoryBillDetailDto> wmsInventoryBillDetailDtos = new ArrayList<>();
+        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.selectByMainSid(sid);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            wmsInventoryBillDetailDtos = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsInventoryBillDetailDto.class)).collect(Collectors.toList());
+            wmsInventoryBillDto.setWmsInventoryBillDetailDtos(wmsInventoryBillDetailDtos);
+        }
+        wmsInventoryBillFeign.inStorage(wmsInventoryBillDto);
+        return rb.success();
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorybill/WmsInventoryBillFeign.java

@@ -21,4 +21,8 @@ public interface WmsInventoryBillFeign {
     @ApiOperation("出库")
     @PostMapping("/outStorage")
     public ResultBean outStorage(@RequestBody WmsInventoryBillDto dto);
+
+    @ApiOperation("入库")
+    @PostMapping("/inStorage")
+    public ResultBean inStorage(@RequestBody WmsInventoryBillDto dto);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorybill/WmsInventoryBillFeignFallback.java

@@ -14,4 +14,9 @@ public class WmsInventoryBillFeignFallback implements WmsInventoryBillFeign {
     public ResultBean outStorage(WmsInventoryBillDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean inStorage(WmsInventoryBillDto dto) {
+        return null;
+    }
 }