出库

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java

@@ -10,4 +10,10 @@ public class AppVinListVo implements Vo {
 
     @ApiModelProperty("车架号")
     private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("业务状态")
+    private String businessState;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -40,8 +40,10 @@
 
     <select id="getRetrievalNotList"
             resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
-        SELECT *
+        SELECT bd.*
         FROM bus_delivered bd
+        left join bus_sales_order bo on bo.contractNo = bd.contractNo
+        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
@@ -52,15 +54,18 @@
                   , #{name}
                   , '%')
             </if>
+            and (select count(*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid)>0 and bo.contractNo = bd.contractNo)>0
         </where>
         group by bd.contractNo
     </select>
 
     <select id="selVinListVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
-        SELECT vinNo as vin
-        FROM bus_delivered
+        SELECT RIGHT(bv.linkNo, 8) as vin,bd.busVinSid,bd.subscription as businessState,bv.linkSid as vinSid
+        FROM bus_delivered bd
+        left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         <where>
             ${ew.sqlSegment}
+            and length(bv.linkSid)>0
         </where>
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -172,14 +172,15 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         } else {
             orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
         }
-        qw.eq("useOrgSid", orgSid);
-        qw.eq("state", 1);
+        qw.eq("bd.useOrgSid", orgSid);
+        qw.eq("bd.state", 1);
         IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotList(page, qw, name);
         for (AppBusDeliveredPageVo record : iPage.getRecords()) {
             String contractNo = record.getContractNo();
             QueryWrapper qw2 = new QueryWrapper<>();
-            qw2.eq("state", 1);
-            qw2.eq("contractNo", contractNo);
+            //待出库：1，出库申请：0
+            qw2.eq("bd.state", 1);
+            qw2.eq("bd.contractNo", contractNo);
             List<AppVinListVo> vinListVo = baseMapper.selVinListVo(contractNo, qw2);
             record.setVinList(vinListVo);
         }

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

@@ -5040,11 +5040,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //根据销售订单查询现车
         List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
         nowCarList.removeAll(Collections.singleton(null));
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        String num = appOrderDetailsVo.getPriceInfo().getNumber();
         if (!nowCarList.isEmpty()) {
             for (AppNowCarListVo vv : nowCarList) {
                 VinListVo vinListVo = new VinListVo();
-                vinListVo.setLinkNo(vv.getVin());
-                vinListVo.setLinkSid(vv.getCarSid());
+                if(StringUtils.isNotBlank(vv.getVin())){
+                    vinListVo.setLinkNo(vv.getVin());
+                }
+                if(StringUtils.isNotBlank(vv.getCarSid())){
+                    vinListVo.setLinkSid(vv.getCarSid());
+                }
                 if (StringUtils.isNotBlank(vv.getCarSid())) {
                     //根据车架号查询是否已出库
                     ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
@@ -5059,12 +5065,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
-
                 vinListVos.add(vinListVo);
             }
+            for (int i = 0; i < Integer.valueOf(num).intValue()-nowCarList.size(); i++) {
+                VinListVo vinListVo = new VinListVo();
+                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);

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

@@ -39,7 +39,7 @@
                linkNo   as vin,
                topSid
         from bus_sales_order_vehicle
-        where salesOrderSid = #{saleOrderSid}
+        where salesOrderSid = #{saleOrderSid} and length(linkSid)>0
     </select>
 
     <select id="selectListBySid" resultType="java.lang.String">