Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -100,11 +100,11 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             String wagonNo = map.get("wagonNo").toString();
             omstrainOrder.setOrderWagonNo(wagonNo);
         }
-        if(map.get("OutStation") != null && !"null".equals(map.get("OutStation"))){
+        if(map.get("OutStation") != null && !"null".equals(map.get("OutStation")) && !"".equals(map.get("OutStation"))){
             long OutStationTime = (long) map.get("OutStation");
             omstrainOrder.setOutstationTime(new Date(OutStationTime));
         }
-        if(map.get("EnStation") != null && !"null".equals(map.get("EnStation"))){
+        if(map.get("EnStation") != null && !"null".equals(map.get("EnStation")) && !"".equals(map.get("EnStation"))){
             long EnStationTime = (long) map.get("EnStation");
             omstrainOrder.setEnstationTime(new Date(EnStationTime));
         }

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

@@ -881,20 +881,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
-            if(orderType == 1){
-                //订阅车辆 查询车牌号
-                String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
-                Map<String, Object> subMap = new HashMap<>();
-                subMap.put("capacityNumber", capacityNumber + "_2");
-                String s = zjxlUtilService.subsCapacity(subMap, 1);
-                if(!"成功".equals(s.substring(s.length() - 2))){
-                    System.out.println("车辆订阅失败：" + capacityNumber);
-                    omstruckOrder.setInsertUpdateRemark("电子围栏订阅失败");
-                }else{
-                    omstruckOrder.setInsertUpdateRemark("电子围栏订阅成功");
-                    zjxlUtilMapper.insertSubCapacity(zjxlUtilMapper.getSubCapacityMaxId(), capacityNumber, DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
-                }
-            }
             if(orderType == 11 || orderType == 15 || orderType == 16 ){
                 //判断是否为化专线厂区内转
                 Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);

src/main/resources/application-prod.yml

@@ -24,4 +24,7 @@ openfeign:
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
-  port: 8095
+  port: 8095
+  tomcat:
+    max-threads: 1000
+    accept-count: 800

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

@@ -14,19 +14,19 @@
     <result column="ENSTATION_TIME" jdbcType="TIMESTAMP" property="enstationTime" />
     <result column="OUTSTATION_TIME" jdbcType="TIMESTAMP" property="outstationTime" />
     <result column="BILLING_WEIGHT" jdbcType="DECIMAL" property="billingWeight" />
-    <result column="IS_ACCEPT " jdbcType="DECIMAL" property="isAccept" />
+    <result column="IS_ACCEPT" jdbcType="DECIMAL" property="isAccept" />
     <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="STRAWMATS" jdbcType="DECIMAL" property="strawmats" />
   </resultMap>
   <sql id="columns">
     ORDER_ID, ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ENSTATION_TIME, OUTSTATION_TIME, 
-    BILLING_WEIGHT, "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+    BILLING_WEIGHT, "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
   </sql>
   <sql id="columns_alias">
     t.ORDER_ID, t.ORDER_NO, t.ORDER_WAGON_NO, t.ORDER_WAGON_WEIGHT, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.ENSTATION_TIME, 
-    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT ", t.WAREHOUSE_ID, t.STRAWMATS
+    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT", t.WAREHOUSE_ID, t.STRAWMATS
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRAIN_ORDER
@@ -73,7 +73,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -122,7 +122,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -173,7 +173,7 @@
       or BILLING_WEIGHT = #{billingWeight}
     </if>
     <if test="isAccept != null">
-      or IS_ACCEPT  = #{isAccept}
+      or IS_ACCEPT = #{isAccept}
     </if>
     <if test="warehouseId != null">
       or WAREHOUSE_ID = #{warehouseId}
@@ -187,7 +187,7 @@
                                 ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
                                 UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                 ENSTATION_TIME, OUTSTATION_TIME, BILLING_WEIGHT,
-                                "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+                                "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
     )
     values (#{orderId,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, #{orderWagonNo,jdbcType=VARCHAR},
             #{orderWagonWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
@@ -236,7 +236,7 @@
         BILLING_WEIGHT,
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT ",
+        "IS_ACCEPT",
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID,
@@ -306,7 +306,7 @@
         ENSTATION_TIME = #{enstationTime,jdbcType=TIMESTAMP},
         OUTSTATION_TIME = #{outstationTime,jdbcType=TIMESTAMP},
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        "IS_ACCEPT" = #{isAccept,jdbcType=DECIMAL},
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
         STRAWMATS = #{strawmats,jdbcType=DECIMAL}
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
@@ -348,7 +348,7 @@
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        "IS_ACCEPT" = #{isAccept,jdbcType=DECIMAL},
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
@@ -379,7 +379,7 @@
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, ENSTATION_TIME,
     OUTSTATION_TIME, BILLING_WEIGHT,
-    "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+    "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
     )
     ( <foreach collection="list" item="item" separator="union all">
     select
@@ -444,7 +444,7 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
       when #{item.orderId,jdbcType=DECIMAL} then #{item.billingWeight,jdbcType=DECIMAL}
     </foreach>
-    ,"IS_ACCEPT "=
+    ,"IS_ACCEPT"=
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
       when #{item.orderId,jdbcType=DECIMAL} then #{item.isAccept,jdbcType=DECIMAL}
     </foreach>
@@ -600,12 +600,13 @@
                           LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR ON RAR.ARRIVAL_ID = TPAR.SEND_STATION_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR1 ON RAR1.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID AND OO.ORDER_STATUS=2
                           LEFT JOIN RMS_CAPACITY   R_CAPACITY ON  R_CAPACITY.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTRUCK_UNLOAD_RESULT  TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                                    AND TUR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTT_ORDER TTO ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                           LEFT JOIN OMSTRAIN_ORDER OTO ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                           LEFT JOIN RMS_PWAREHOUSE_GRID RPG ON RPG.STACKING_ID = OO.ORDER_ID

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

@@ -148,6 +148,7 @@
         SELECT OO.ORDER_ID AS "orderId"
         FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_NUMBER = #{orderNumber}
+        AND OO.ORDER_STATUS = 5
     </select>