Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -45,7 +45,9 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppOrderInfoDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
@@ -202,7 +204,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             if (orderInfo != null) {
                 BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
                 busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
-                if(StringUtils.isNotBlank(guildPrice)){
+                if (StringUtils.isNotBlank(guildPrice)) {
                     busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
                 }
                 busSalesOrderModel1.setBrandName(brandName);
@@ -572,21 +574,40 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
                     busSalesOrderService.updateMakeUp1(salesOrderSid);
                 }
-            }else{
+            } else {
                 //删除上装信息
                 busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
                 busSalesOrderService.updateMakeUp1(salesOrderSid);
             }
         }
-
-
+        String state = dto.getState();
+        if ("2".equals(state)) {//需采购
+            //查询现车和采购订单是否有数据、若有数据，则查询topSid是否有值，若有值，则删除上装信息、若无值，则继续
+            List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(salesOrderSid);
+            vinList.removeAll(Collections.singleton(null));
+            if (vinList.size() > 0) {
+                List<String> topSidLists = vinList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+                if(topSidLists.size()>0){
+                    //清除上装信息
+                    busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
+                }
+            }
+            List<BusSalesVehicleOrder> orderList = busSalesVehicleOrderService.selectByOrderSid(salesOrderSid);
+            orderList.removeAll(Collections.singleton(null));
+            if (vinList.size() > 0) {
+                List<String> topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+                if(topSidLists.size()>0){
+                    //清除上装信息
+                    busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
+                }
+            }
+        }
         //删除现车、采购订单的数据、若类型为现车，添加现车数据，若为采购订单，则新增采购订单数据
         busSalesOrderVehicleService.deleteByOrderSid(salesOrderSid);
         busSalesVehicleOrderService.deleteByOrderSid(salesOrderSid);
         //0现车，1采购订单，2排产
         //数据库中：1现车，2采购订单，3排产
         String type = "";
-        String state = dto.getState();
         int num = 0;
         if ("0".equals(state)) {//现车
             type = "1";

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

@@ -99,4 +99,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<VinListsVo> selectListBySids(String sid);
 
     int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo);
+
+    List<BusSalesOrderVehicle> selectByOrderSid(String salesOrderSid);
 }

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

@@ -67,4 +67,8 @@
     <update id="updateTemporaryNo">
         update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid}
     </update>
+
+    <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where salesOrderSid = #{salesOrderSid}
+    </select>
 </mapper>

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

@@ -212,4 +212,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         baseMapper.updateTemporaryNo(sid,temporaryNo);
         return rb.success();
     }
+
+    public List<BusSalesOrderVehicle> selectByOrderSid(String salesOrderSid) {
+        return baseMapper.selectByOrderSid(salesOrderSid);
+    }
 }

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

@@ -86,4 +86,6 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
     List<BusSalesVehicleOrder> selectLinkSid(String businessSid);
 
     List<BusSalesVehicleOrder> selectLists(String sid);
+
+    List<BusSalesVehicleOrder> selectByOrderSid(String salesOrderSid);
 }

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

@@ -78,4 +78,8 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
+        select * from bus_sales_vehicle_order where salesOrderSid = #{salesOrderSid}
+    </select>
 </mapper>

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

@@ -197,4 +197,8 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         }
         return list;
     }
+
+    public List<BusSalesVehicleOrder> selectByOrderSid(String salesOrderSid) {
+        return baseMapper.selectByOrderSid(salesOrderSid);
+    }
 }