优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -86,4 +86,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
     BusArrearsCarryVehicleApplyVo selComByVehSid(String vehSid);
 
     List<String> selectByNo(String sid);
+
+    List<String> selectSid(String contractId);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -152,4 +152,9 @@
         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bd.applySid = #{sid} and bo.contractNo = ba.contractNo
     </select>
+
+    <select id="selectSid" resultType="java.lang.String">
+        select vinSid from bus_arrears_carry_vehicle_details bd left join bus_arrears_carry_vehicle_apply ba on ba.sid = bd.applySid
+        where ba.contractNo = #{contractId} and ba.nodeState != '终止' and length(ba.nodeState)>0
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -1711,8 +1711,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
-        //查询该申请中的车架号是否被锁定
         List<AdCarListVo> carList = dto.getVinList();
+        List<String> vinNoLists = new ArrayList<>();
+        List<String> contractNoList = baseMapper.selectSid(dto.getContractId());
+        for (AdCarListVo adCarListDto : carList) {
+            String vinSid = adCarListDto.getCarSid();
+            if(contractNoList.contains(vinSid)){
+                vinNoLists.add(adCarListDto.getVin());
+            }
+        }
+        if(!vinNoLists.isEmpty()){
+            return rb.setMsg(String.join(",", vinNoLists) + "已存在发起流程的申请");
+        }
+        //查询该申请中的车架号是否被锁定
         List<String> vinSidi = new ArrayList<>();
         boolean isT = false;
         for (AdCarListVo adCarListDto : carList) {

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

@@ -110,4 +110,8 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
     List<String> selectByContractNoToVinSid(@Param("contractNo") String contractId, @Param("list") List<String> vinSid);
 
     int selectNumByContractNo(String contractId);
+
+    List<String> selectSid(String contractId);
+
+    List<String> selectBySid(@Param("contractNo") String contractId, @Param("list") List<String> vinNoLists);
 }

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

@@ -141,4 +141,18 @@
         select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered_apply bd on bd.sid = bddd.applySid
         where contractNo = #{contractId} and (bd.state =2 or bd.state = 3)
     </select>
+
+    <select id="selectSid" resultType="java.lang.String">
+        select bd.vinSid from bus_delivered_apply_details bd left join bus_delivered_apply ba on ba.sid = bd.applySid
+        where ba.contractNo = #{contractId} and ba.nodeState != '终止' and length(ba.nodeState)>0
+    </select>
+
+    <select id="selectBySid" resultType="java.lang.String">
+        select bv.linkNo from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bo.contractNo = #{contractNo} and bv.linkSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

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

@@ -2216,12 +2216,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //判断选择的优惠是否超出
         List<AppCarListVo> carList = dto.getCarList();
         if (!carList.isEmpty()) {
+            List<String> vinNoLists = new ArrayList<>();
+            List<String> vinSidLists = baseMapper.selectSid(dto.getContractId());
             //判断合同编号是否一致
             for (int a = 0; a < carList.size(); a++) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractId(), carList.get(a).getVinSid());
                 if (busSalesOrderVehicle == null) {
                     return rb.setMsg("所选车辆与合同编号不匹配");
                 }
+                if(vinSidLists.contains(carList.get(a).getVinSid())){
+                    vinNoLists.add(carList.get(a).getVinSid());
+                }
+            }
+            vinNoLists = baseMapper.selectBySid(dto.getContractId(),vinNoLists);
+            if(!vinNoLists.isEmpty()){
+                return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程");
             }
             //判断已经选择的车辆是否已经提交
             List<String> vinSid = carList.stream().map(AppCarListVo::getVinSid).collect(Collectors.toList());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@@ -90,28 +90,11 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         }
         BeanUtil.copyProperties(dto, scmPurchaseChannel, "sid");
         scmPurchaseChannel.setOperateSid(dto.getUserSid());
-
+        //ToDo:待完成
         baseMapper.updateById(scmPurchaseChannel);
         return rb.success();
     }
 
-    public void insertByDto(ScmPurchaseChannelDto dto) {
-        ScmPurchaseChannel entity = new ScmPurchaseChannel();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        entity.setState(1);
-        baseMapper.insert(entity);
-    }
-
-    public void updateByDto(ScmPurchaseChannelDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        ScmPurchaseChannel entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
     public ScmPurchaseChannelDetailsVo fetchDetailsVoBySid(String sid) {
         ScmPurchaseChannel entity = fetchBySid(sid);
         ScmPurchaseChannelDetailsVo vo = new ScmPurchaseChannelDetailsVo();
@@ -121,11 +104,20 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
 
     public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
         ResultBean rb = ResultBean.fireFail();
+        //ToDo:需判断是否存在采购渠道待选择不存在的数据。
         for (ScmPurchaseChannelDto scmPurchaseChannelDto : dto) {
-            String purchaseOrderTypeKey = scmPurchaseChannelDto.getPurchaseOrderTypeKey();
+          /*  String purchaseOrderTypeKey = scmPurchaseChannelDto.getPurchaseOrderTypeKey();
             String purchaseOrderTypeValue = scmPurchaseChannelDto.getPurchaseOrderTypeValue();
             String sid = scmPurchaseChannelDto.getSid();
-            baseMapper.choice(sid, purchaseOrderTypeKey, purchaseOrderTypeValue);
+            baseMapper.choice(sid, purchaseOrderTypeKey, purchaseOrderTypeValue);*/
+            ScmPurchaseChannel scmPurchaseChannel = fetchBySid(scmPurchaseChannelDto.getSid());
+            if (scmPurchaseChannel == null) {
+                return rb.setMsg("该待选择的采购渠道不存在");
+            }
+            BeanUtil.copyProperties(scmPurchaseChannelDto, scmPurchaseChannel, "sid");
+            scmPurchaseChannel.setOperateSid(scmPurchaseChannelDto.getUserSid());
+            //ToDo:待完成
+            baseMapper.updateById(scmPurchaseChannel);
         }
         return rb.success().setMsg("选择成功");
     }