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

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

@@ -341,12 +341,20 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
+
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 
+    //判断是否为达钢厂区内转
+    Map<String,Object> isInwardLine(BigDecimal orderId);
+
     // 通过运单id或者运单号查询车辆是否放行
     String canCapacityEnfactory(Map<String, Object> mapValue);
+
     // 出库信息
     List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+
     // 通过运单下的物资信息
     int closeInwardOrderByPlan(BigDecimal bigDecimal);
+
+    Map<String, Object> getInwardSteelOrderMessageToApp(Map<String, Object> map);
 }

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

@@ -206,6 +206,7 @@ public interface IOmstruckOrderService {
     int refuseCtrlZ(Map<String, Object> map);
 
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> mapValue);
+
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
     // 出库信息
     List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);

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

@@ -78,6 +78,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Autowired
     JoinFeign joinFeign;
 
+    private static final String judgeInwardFactory = "化工园区铁专线内转";
+
 
     /**
      * 用于远程调用运输订单新增
@@ -117,9 +119,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 1:
             case 2:
             case 3:
-                i = dispatchSteelOrder(map);//新增焦炭发运计划订单
-                break;
             case 4:
+                i = dispatchSteelOrder(map);//新增焦炭发运计划订单
                 break;
             case 5:
             case 6:
@@ -608,7 +609,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 result += omstruckOrderMapper.deleteTimeTaskByTotalId(resultTotalId);
             }
         }
-        if(orderType == 1){
+        if(orderType == 1||orderType == 4){
             //取消订阅车辆
             String remark = String.valueOf(mesMap.get("insertUpdateRemark"));
             if("电子围栏订阅成功".equals(remark)){
@@ -859,7 +860,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
             int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
-            if(orderType == 1){
+            if(orderType == 1||orderType==4){
                 //订阅车辆 查询车牌号
                 String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
                 Map<String, Object> subMap = new HashMap<>();
@@ -874,16 +875,29 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
             }
             if(orderType == 11 || orderType == 15 || orderType == 16){
-                //发送计量委托
-                orderMessage.put("asd", 1);
+                //判断是否为化专线厂区内转
+                Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);
+                String rangeValue = (String) inwardLine.get("rangeValue");
+                if (rangeValue!=null&&rangeValue.contains(judgeInwardFactory)) {
+                    //设置进厂厂区为达兴能源
+                     orderMessage.put("factory",2);
+                }else {
+                    //设置进厂厂区为达兴能源
+                     orderMessage.put("factory",1);
+                }
                 orderMessage.put("orderId", orderId);
+                orderMessage.put("asd", 1);
                 Map<String, Object> mcMap = tmsTruckFeign.sendMeasureCommission(orderMessage);
-                if(!"200".equals(mcMap.get("code"))){
+                if (!"200".equals(mcMap.get("code"))) {
                     throw new RuntimeException("委托发送失败!");
                 }
             }else if(orderType!=21){
                 //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            }
+            //如果订单类型为4发送钢材空委托给计量系统
+            if (orderType==4){
+
             }
             //判断订单是否是一车多单
             if (orderType ==12 || orderType ==13 || orderType ==14 || orderType ==19) {
@@ -973,7 +987,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         map.put("capacityId", capacityId);
         //通过运力Id匹配 已下发的运输订单
         List<Map<String, Object>> truckOrderByCapacityNum;
-        if ((Integer) map.get("orderType") == 1 || (Integer) map.get("orderType") == 2) {
+        if ((Integer) map.get("orderType") == 1 || (Integer) map.get("orderType") == 2||(Integer) map.get("orderType") == 4) {
             truckOrderByCapacityNum = omstruckOrderMapper.getSaleTruckOrderByCapacityNum(map);
         } else {
             truckOrderByCapacityNum = omstruckOrderMapper.getTruckOrderByCapacityNum(map);
@@ -1314,7 +1328,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         //通过运力Id匹配 已下发的运输订单
         Map<String, Object> truckOrderByCapacityNum = new HashMap<>();
-        if ((Integer) map.get("orderType") == 1 || (Integer) map.get("orderType") == 2) {
+        if ((Integer) map.get("orderType") == 1 || (Integer) map.get("orderType") == 2||(Integer) map.get("orderType") == 4) {
             //查询主干信息
             Map<String, Object> map1 = omstruckOrderMapper.getSaleTruckOrderByCapacityId(map);
             //查询物资信息
@@ -2009,14 +2023,17 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String steelJudge = null;
         switch (orderType){
             case 1:
-                mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                 mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                 steelJudge = "steel";
+                 break;
+            case 4:
+                mesMap = omstruckOrderMapper.getInwardSteelOrderMessageToApp(map);
                 steelJudge = "steel";
                 break;
             case 2:
                 mesMap = omstruckOrderMapper.getXSOrderMessageToApp(map);
                 break;
             case 3:
-            case 4:
                 mesMap = omstruckOrderMapper.getFYJHOrderMessageToApp(map);
                 break;
             case 5:

src/main/resources/application-dev.yml

@@ -20,6 +20,8 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8009}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 
 
 server:

src/main/resources/application-prod.yml

@@ -5,13 +5,20 @@ spring:
     password: Dil123789
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
+    druid:
+      max-active: 20
+      max-wait: 1200
+      keep-alive: true
+      initial-size: 10
+      min-evictable-idle-time-millis: 180000
+      min-idle: 10
   application:
     name: DAL-OMS-API-PROD
 
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:

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

@@ -3977,6 +3977,21 @@
         where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
     </select>
 
+   <!-- 判断是否为达钢厂区内转-->
+    <select id="isInwardLine" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+     select RTR.TRANS_RANGE_VALUE "rangeValue"
+      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 AIP.PLAN_ID =ARP.PLAN_ID
+     LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+     ON AIR.REQUIREMENT_ID =ARP.REQUIREMENT_ID
+     left join RMS_TRANS_RANGE RTR
+     ON AIR.LINE_ID = RTR.TRANS_RANGE_ID
+     WHERE  OO.ORDER_ID =#{orderId}
+    </select>
+
     <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
         SELECT
         TER.INSERT_UPDATE_REMARK AS "isOk"
@@ -4056,7 +4071,50 @@
         )
         ORDER BY "orderNumber" DESC
     </select>
-    
+    <select id="getInwardSteelOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus",
+        RAS.ARRIVAL_NAME "sendStaionName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR  ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+
     <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 7