Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/boco/nbd/wios/export/Contants.java

@@ -63,9 +63,9 @@ public class Contants {
 
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
 
-    public static final String export_wareHouse_title = "序号,仓库名称,仓库等级,所属区域,仓库归属,所属服务商,启用状态,描述";
+    public static final String export_wareHouse_title = "序号,仓库名称,仓库等级,仓库区域,仓库归属,收件人,联系电话,仓库地址,启用状态,备注";
 
-    public static final String export_wareHouse_field = "no,name,warehouseLevenName,areaName,warehouseAttributionName,serviceProviderName,isEnabledName,msg";
+    public static final String export_wareHouse_field = "no,name,warehouseLevenName,areaName,warehouseAttributionName,receivePeople,receivePhone,receiveAddress,isEnabledName,msg";
 
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
 

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

@@ -8,8 +8,10 @@ import com.boco.nbd.wios.flow.entity.bo.ManualSapBo;
 import com.boco.nbd.wios.flow.entity.po.OrderAbnormalPO;
 import com.boco.nbd.wios.flow.entity.po.OrderPO;
 import com.boco.nbd.wios.flow.enums.OrderInfoEnum;
+import com.boco.nbd.wios.flow.mapper.def.FlowOrderMapper;
 import com.boco.nbd.wios.flow.service.IOrderAbnormalService;
 import com.boco.nbd.wios.flow.service.IOrderService;
+import com.boco.nbd.wios.flow.service.impl.OrderServiceImpl;
 import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.flow.util.ValidUtil;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
@@ -180,5 +182,12 @@ public class FlowOrderController {
             throw new IOException(e.getMessage());
         }
     }
+    @Autowired
+    private FlowOrderMapper flowOrderMapper;
 
+    @GetMapping("/getCanDeliveryOrder")
+    @ApiOperation("获取可以发货的订单列表")
+    public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId){
+        return ResponseMessage2.Success2(flowOrderMapper.getCanDeliveryOrder(orderId));
+    }
 }

src/main/java/com/boco/nbd/wios/flow/mapper/def/FlowOrderMapper.java

@@ -7,6 +7,7 @@ import com.boco.nbd.wios.flow.entity.qo.CamsOrderQo;
 import com.boco.nbd.wios.manage.entity.bo.OrderBo;
 import com.ihidea.core.support.session.SessionInfo;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.Date;
 import java.util.List;
@@ -95,4 +96,7 @@ public interface FlowOrderMapper extends BaseMapper3<OrderPO> {
      */
     List<VisitOrderPO> getVisitOrderScore(OrderBo orderBo);
 
+    @Select("select o.* from t_order o inner join t_wallbox_apply w on o.id=w.order_id where o.id like concat('%', #{orderId}, '%') and w.check_status=2 and IFNULL(w.tracking_status,'0')='0'")
+    List<OrderPO> getCanDeliveryOrder(@Param("orderId")String orderId);
+
 }