3.15

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -186,6 +186,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getUnloadOrderMaterial(map));
     }
 
+    @PostMapping("getUnloadOrderWarehouseName")
+    public RESTfulResult getUnloadOrderWarehouseName(@RequestBody(required = false) Map<String,Object> map){
+        return success(omstruckOrderSeparateService.getUnloadOrderWarehouseName(map));
+    }
+
     /**
      * 承运商销售分派运输订单给司机
      * @param mapValue

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.java

@@ -40,4 +40,5 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     //根据订单ID查询订单物资ID
     List<Map<String, Object>> getOrderMaterial(Integer orderId);
 
+    List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -41,4 +41,6 @@ public interface IOmstruckOrderSeparateService {
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
 
     int closeInwardOrder(Integer orderId, Integer sqe);
+
+    List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -642,4 +642,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         }
         return i;
     }
+
+    @Override
+    public List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map) {
+        return omstruckOrderMaterialMapper.getUnloadOrderWarehouseName(map);
+    }
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1991,6 +1991,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            //如果订单类型为11 当订单大于截止日期时，不显示订单
             if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue()==11){
                 int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));
                 if(result == 0){

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -440,6 +440,27 @@
                      on RM.MATERIAL_ID = OOM.MATERIAL_ID
     where oo.ORDER_NUMBER = #{orderNumber}
   </select>
+
+  <select id="getUnloadOrderWarehouseName" resultType="java.util.Map" parameterType="java.util.Map">
+    select RW.WAREHOUSE_NAME "warehouseName",
+            RW.WAREHOUSE_ID "warehouseId"
+    from OMSTRUCK_ORDER OO
+    LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+  </select>
   <!--  //通过订单号获取计量实绩主键
       BigDecimal selectWeightResultId(BigDecimal orderId);-->
 <!--  <select id="selectWeightResultId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">-->