下拉合并

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

@@ -203,8 +203,13 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("/getCapacityAllOrder")
-    public RESTfulResult getCapacityAllOrder(String capacityNumber){
-        List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(capacityNumber);
+    public RESTfulResult getCapacityAllOrder(String capacityNumber,String date){
+        Map<String, Object> map = new HashMap<>();
+        map.put("capacityNumber",capacityNumber);
+        if(date != null){
+            map.put("date",date);
+        }
+        List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(map);
         return success(capacityAllOrderList);
     }
 

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

@@ -75,7 +75,7 @@ public interface OmstruckOrderSeparateMapper {
 
 
     //查询当前车辆之前所有已完成的订单
-    List<Map<String, Object>> getCapacityAllOrder(String capacityNumber);
+    List<Map<String, Object>> getCapacityAllOrder(Map<String,Object> map);
 
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);

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

@@ -496,8 +496,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      * @param capacityNumber 车牌号
      * @return 查询当前车辆之前所有已完成的订单号 以及 订单ID
      **/
-    public List<Map<String, Object>> getCapacityAllOrder(String capacityNumber){
-        return omstruckOrderSeparateMapper.getCapacityAllOrder(capacityNumber);
+    public List<Map<String, Object>> getCapacityAllOrder(Map<String,Object>map){
+        return omstruckOrderSeparateMapper.getCapacityAllOrder(map);
     }
 
 
@@ -665,16 +665,25 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
-        if(map != null){
-            Date dueDate = (Date) map.get("dueTime");
-            //当前时间小于截至日期
-            long DueTime = dueDate.getTime() + 86400000;
-            //获取当前时间
-            Date date = new Date();
-            long nowTime = date.getTime();
-            if (nowTime < DueTime){
-                //推送
-                i += addNewTransportOrder(new BigDecimal(orderId));
+        if (map != null) {
+            if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11) {
+                Date dueDate = (Date) map.get("dueTime");
+                //当前时间小于截至日期
+                long DueTime = dueDate.getTime() + 86400000;
+                //获取当前时间
+                Date date = new Date();
+                long nowTime = date.getTime();
+                if (nowTime < DueTime) {
+                    //推送
+                    i += addNewTransportOrder(new BigDecimal(orderId));
+                }
+            }
+            if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 15 || DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 16) {
+                Integer planEnableStatus = DataChange.dataToBigDecimal(map.get("planEnableStatus")).intValue();
+                if (planEnableStatus == 1) {
+                    //推送
+                    i += addNewTransportOrder(new BigDecimal(orderId));
+                }
             }
         }
         //根据订单ID查找需求里面的承运范围和物资

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

@@ -649,7 +649,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
             RmsCapacity rmsCapacity = rmsCapacities.get(0);
-//            rmsCapacity.setCapacityStatus(new BigDecimal(2));
             result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
             BigDecimal capacityId = rmsCapacity.getCapacityId();
             capacityMap.clear();
@@ -673,7 +672,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(orderType);
-            omstruckOrder.setLineId(lineId);
+            if(lineId != null){
+                omstruckOrder.setLineId(lineId);
+            }
             result +=omstruckOrderMapper.insertSelective(omstruckOrder);
             OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
             BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
@@ -693,10 +694,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Override
     public List<Map<String, Object>> getPurInwardOrderList(Map<String, Object> mapValue) {
         List<Map<String,Object>> mapList = omstruckOrderMapper.getPurInwardOrderList(mapValue);
-        for (Map<String,Object>map:mapList
-             ) {
-            map.put("loadName","化工园区铁专线");
-        }
         return mapList;
     }
 
@@ -827,7 +824,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     zjxlUtilMapper.insertSubCapacity(zjxlUtilMapper.getSubCapacityMaxId(), capacityNumber, DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
                 }
             }
-            if(orderType == 11){
+            if(orderType == 11 || orderType == 15 || orderType == 16){
                 //发送计量委托
                 orderMessage.put("asd", 1);
                 orderMessage.put("orderId", orderId);
@@ -1976,6 +1973,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     mesMap.put("organizationCode","二厂");
                 }
                 break;
+            case 15:
+                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap.put("loadName","老区轨道衡");
+                break;
+            case 16:
+                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap.put("loadName","一焦化");
+                break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
                 mesMap.put("inwardType", "计重");
@@ -2019,7 +2024,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
-            if(orderType == 10|| orderType == 20){
+            if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));

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

@@ -2541,10 +2541,15 @@
         AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
         OO.ORDER_ID                        AS "orderId",
-        AIP.INSERT_TIME                    AS "insertTime"
+        AIP.INSERT_TIME                    AS "insertTime",
+        RW.WAREHOUSE_NAME                  AS "unloadName",
+        RW1.WAREHOUSE_NAME                 AS "loadName",
+        RM.MATERIAL_NAME                   AS "materialName"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
@@ -2557,6 +2562,10 @@
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN  RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         WHERE AIP.DELETED = 0
         AND OO.ORDER_TYPE = 11
         <if test="carrierId != null">
@@ -2622,6 +2631,24 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="unloadName != null">
+                and
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadName != null">
+                and
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
     </select>
@@ -2929,7 +2956,8 @@
         OO.ORDER_STATUS "orderStatus",
         RS.SUPPLIER_NAME "shipperName",
         RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        APO.PURCHASING_ORGANIZATION_ID "organizationId"
+        APO.PURCHASING_ORGANIZATION_ID "organizationId",
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -2939,6 +2967,8 @@
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
         LEFT JOIN RMS_SUPPLIER RS
         ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         LEFT JOIN RMS_CONSIGNEE RCG
@@ -3174,7 +3204,8 @@
         OO.ORDER_ID                AS "orderId",
         RS.SUPPLIER_NAME           AS "supplierName",
         RCE.CONSIGNEE_COMPANY_NAME AS "consigneeName",
-        OO.ORDER_NUMBER            AS "orderNo"
+        OO.ORDER_NUMBER            AS "orderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "shipName"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
@@ -3203,7 +3234,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4,9,10,11,20,21)
+        AND OO.ORDER_TYPE IN (10,20,15,16)
         AND OO.ORDER_STATUS = #{orderStatus}
         <if test="carrierId !=null">
             AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})
@@ -3364,7 +3395,9 @@
     </select>
 <!-- 根据运输订单id查找需求日期 -->
  <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-    select AIR.DUE_DATE  "dueTime"
+    select AIR.DUE_DATE  "dueTime",
+           OO.ORDER_TYPE "orderType",
+           aip.PLAN_EABLE_STATUS "planEnableStatus"
     from OMSTRUCK_ORDER OO
     left join AMSTRUCK_INWARD_PLAN AIP
     on AIP.PLAN_ID=OO.ORDER_PLAN_ID
@@ -3619,13 +3652,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
-        </if>
-        <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
-        </if>
+        and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
         GROUP BY TLR.CAPACITY_REMARK
         )
     </select>

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

@@ -434,12 +434,12 @@
     </select>
 
 <!--    查询当前车辆之前所有已完成的订单  -->
-    <select id="getCapacityAllOrder" parameterType="string" resultType="java.util.Map">
+    <select id="getCapacityAllOrder" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
                  select OO.ORDER_ID     "orderId",
-                        OO.ORDER_NUMBER "orderNumber"
-
+                        OO.ORDER_NUMBER "orderNumber",
+                        OO.ORDER_RECEIVE_REFUSE_TIME "orderDate"
                  from OMSTRUCK_ORDER OO
                           left join RMS_CAPACITY RC
                                     on RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -447,7 +447,9 @@
                    and OO.ORDER_STATUS = 2
                  order by OO.ORDER_RECEIVE_REFUSE_TIME desc
              )
-        where rownum &lt;= 51
+        <if test="date != null">
+            Where to_char("orderDate",'YYYY-MM') = #{date}
+        </if>
     </select>
 
 <!--  查询订单发货日期 （订单类型为2） -->