新增发货的时候，分别根据是墙盒还是辅材，分别获取物料编码，物料名称，厂商等信息，存入

src/main/java/com/boco/nbd/wios/flow/controller/FlowOrderController.java

@@ -195,8 +195,8 @@ public class FlowOrderController {
             List<OrderPO> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
             return ResponseMessage2.Success2(has);
         }else {
-            List<OrderPO> has = list.stream().filter(i -> !i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
-            return ResponseMessage2.Success2(has);
+            //List<OrderPO> has = list.stream().filter(i -> !i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
+            return ResponseMessage2.Success2(list);
         }
     }
 }

src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java

@@ -72,7 +72,7 @@ public class WallboxApplyController {
             throw new ServiceException("订单不存在");
         }
         Integer status = order.getStatus();
-        // 检查订单状态是否在0-43之间
+        // 检查订单状态是否在19-43之间
         boolean allowed = status >= OrderStatus.SURVEY_FINISH.getType() && status <= OrderStatus.INSTALLING.getType();
         if (!allowed) {
             throw new ServiceException("订单已在安装中，无法申请");

src/main/java/com/boco/nbd/wios/manage/entity/bo/WarehouseDetail.java

@@ -13,6 +13,7 @@ public class WarehouseDetail extends CoreEntity {
     private String name;
     private String receivePeople;
     private String receivePhone;
+    private String materialsName;
     public String getId() {
         return id;
     }
@@ -44,4 +45,12 @@ public class WarehouseDetail extends CoreEntity {
     public void setReceivePhone(String receivePhone) {
         this.receivePhone = receivePhone;
     }
+
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
 }
\ No newline at end of file

src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml

@@ -134,7 +134,6 @@
         t_wallbox_apply.created_time,
         t_wallbox_apply.modify_account,
         t_wallbox_apply.modify_time,
-        t_wallbox_apply.area_name,
         t_order.shipno as tracking_number,
         t_order.status as install_status,
         td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender,td.sender_phone senderPhone,td.receiver receiver,
@@ -158,6 +157,7 @@
             </if>
         </where>
       group by t_wallbox_apply.order_id
+      order by t_wallbox_apply.created_time
     </select>
 
     <select id="selectWallboxApplyById" parameterType="Long"

src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml

@@ -184,7 +184,12 @@
         select id,name from t_warehouse where id = #{superiorWarehouseId}
     </select>
     <select id="warehouseDetailById" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseDetail">
-        select id,name,receive_people,receive_phone from t_warehouse where id = #{id}
+        select tw.id,tw.name,tw.receive_people,tw.receive_phone,ts.materials_name
+        from t_warehouse tw
+        left join t_warehouse_materials tm on tm.warehouse_id = tw.id
+        left join t_materials ts on ts.id = tm.materials_id
+        where tw.id = #{id}
+        GROUP BY tw.id
     </select>
 
 </mapper>
\ No newline at end of file