批量新增发货做校验 不能发货重复的订单号

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -69,6 +69,16 @@ public class DeliveryController {
         //String orderid= snowFlakeService.getNextId(0,0)+"";
         //String orderid= snowFlakeService.getNextId(0,0)+"";
         return new BaseResponse(deliveryAddVoList.stream()
         return new BaseResponse(deliveryAddVoList.stream()
                 .map(da->{
                 .map(da->{
+                    List<String> list=new ArrayList<>();
+                    if (list.contains(da.getInstallOrder())){
+                        throw new ServiceException("400","不能发重复的订单号!");
+                    }else {
+                        list.add(da.getInstallOrder());
+                    }
+                    Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());
+                    if (!StringUtils.isEmpty(deliveryInstallOrder)){
+                        throw new ServiceException("400","订单号重复!");
+                    }
                     Delivery delivery= DeliveryConvert.INSTANCE.convertAddVo(da);
                     Delivery delivery= DeliveryConvert.INSTANCE.convertAddVo(da);
                     delivery.setDeliveryOrder("FH"+NumberUtil.getRandomOrderId());
                     delivery.setDeliveryOrder("FH"+NumberUtil.getRandomOrderId());
                     if(!StringUtils.isEmpty(delivery.getLogisticOrder())){
                     if(!StringUtils.isEmpty(delivery.getLogisticOrder())){

src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.java

@@ -33,4 +33,5 @@ public interface DeliveryMapper {
     List<Delivery> selectDeliveryList(Delivery delivery);
     List<Delivery> selectDeliveryList(Delivery delivery);
 
 
     Delivery selectByLogisticOrder(String logisticOrder);
     Delivery selectByLogisticOrder(String logisticOrder);
+    Delivery selectByInstallOrder(String installOrder);
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml

@@ -138,6 +138,12 @@
     from t_delivery
     from t_delivery
     where logistic_order = #{logisticOrder,jdbcType=VARCHAR}
     where logistic_order = #{logisticOrder,jdbcType=VARCHAR}
   </select>
   </select>
+  <select id="selectByInstallOrder" parameterType="string" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_delivery
+    where install_order = #{installOrder,jdbcType=VARCHAR}
+  </select>
   <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultMap="BaseResultMap">
     select
     select
     <if test="distinct">
     <if test="distinct">

src/main/java/com/starcharge/wios/export/Contants.java

@@ -98,7 +98,7 @@ public class Contants {
             "id,materialName,materialCode,specification,measurementUnit,applyQuantity,currentySap,applyStatus,team,logisticOrder,logisticStatus,receivingStatus,recipents,approvedQuantity,applyTime";
             "id,materialName,materialCode,specification,measurementUnit,applyQuantity,currentySap,applyStatus,team,logisticOrder,logisticStatus,receivingStatus,recipents,approvedQuantity,applyTime";
     public static final String export_receive_title = "序号,安装订单号,产品名称,到货数量,产品批次,物料类别,到货仓库,收货人,收货时间,送货单";
     public static final String export_receive_title = "序号,安装订单号,产品名称,到货数量,产品批次,物料类别,到货仓库,收货人,收货时间,送货单";
     public static final String export_receive_field =
     public static final String export_receive_field =
-            "id,installOrder,materialName,arrivalQuantity,productBatch,materialCategory,arrivalWarehouse,receiver,updatedTime,receivedOrder";
+            "id,installOrder,materialName,arrivalQuantity,productBatch,materialCategory,arrivalWarehouse,receiver,updatedTime,deliveryOrder";
     public static final String export_delivery_title = "序号,安装单号,物流单号,物料编码,物料名称,厂商,物料类型,物流状态,物流服务商";
     public static final String export_delivery_title = "序号,安装单号,物流单号,物料编码,物料名称,厂商,物料类型,物流状态,物流服务商";
     public static final String export_delivery_field =
     public static final String export_delivery_field =
             "id,installOrder,logisticOrder,materialCode,materialName,materialCompany,materialCategory,logisticStatus,logisticCompany";
             "id,installOrder,logisticOrder,materialCode,materialName,materialCompany,materialCategory,logisticStatus,logisticCompany";