根据申请单号到发货表中获取该申请单号下的所有物流单号

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

@@ -90,6 +90,19 @@ public class DeliveryController {
                             throw new ServiceException("当前SN号已经录入使用");
                         }
                     }
+                    //辅材发货的时候校验一个申请单号下面的多个申请数量不能大于审批数量
+                    Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
+                    if (ProductType.辅材.name().equals(da.getIsproduct())){
+                        Integer quantity=0;
+                        for (DeliveryAddVo deliveryAddVo:deliveryAddVoList){
+                            quantity=quantity+deliveryAddVo.getQuantity();
+                        }
+                        if (!StringUtils.isEmpty(tauxiliarymaterials)){
+                            if (Integer.parseInt(tauxiliarymaterials.getApprovedQuantity())>quantity){
+                                throw new ServiceException("400","辅材申请的数量不能大于审批数量!");
+                            }
+                        }
+                    }
                     da.setInstallStatus(0);
                     Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());
                     if (!StringUtils.isEmpty(deliveryInstallOrder)){
@@ -151,7 +164,6 @@ public class DeliveryController {
                          delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
                          delivery.setArrivalWarehouse(jsonObjectDataArrival.getString("name"));
                     }else {
-                        Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
                         if (!StringUtils.isEmpty(tauxiliarymaterials)){
                             delivery.setReceiver(tauxiliarymaterials.getRecipents());
                             delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone());
@@ -223,4 +235,5 @@ public class DeliveryController {
     public BaseResponse<WallboxApply> supplierIdByOrderId(@RequestParam String orderId){
         return new BaseResponse(this.wallboxApplyMapper.selectWallboxApplyByOrderId(orderId));
     }
+
 }

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

@@ -256,4 +256,18 @@ public class TauxiliarymaterialsController {
     public BaseResponse<Tauxiliarymaterials> getRecentHasChecked(@RequestParam @ApiParam("物料编码") String materialCode){
         return new BaseResponse<Tauxiliarymaterials>(this.tauxiliarymaterialsMapper.getRecentTAuxiliaryMaterials(materialCode));
     }
+    @GetMapping("/queryLogisticOrder")
+    @ApiOperation(value = "根据申请单号查询物流单号")
+    public BaseResponse<List<String>> queryLogisticOrder(Delivery delivery){
+        List<String> listStatus= Arrays.asList("已发货","已收货","退货已申请","退货已驳回","退货已通过","退货完成");
+        delivery.setLogisticStatusList(listStatus);
+        List<Delivery> list=this.deliveryMapper.selectDeliveryList(delivery);
+        List<String> listApplyOrder=new ArrayList<>();
+        for (Delivery delivery1:list){
+            if (!StringUtils.isEmpty(delivery1)){
+                listApplyOrder.add(delivery1.getLogisticOrder());
+            }
+        }
+        return new BaseResponse(listApplyOrder);
+    }
 }