Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

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

@@ -72,4 +72,6 @@ public interface UtilsMapper {
     //通过人员管理SSOID查询人员ID
     Integer getPersonnelIdBySsoId(String personnelSsoId);
 
+    //查询订单是否确认
+    Integer getDriverConfirmation(BigDecimal orderId);
 }

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

@@ -153,9 +153,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         map.putAll(selectMap);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
-        //修改路段顺序号
-        i += utilsService.updateOrderLineSequence(map);
         //判断委托是否发送成功
         int checkMeasureCommission = 0;
         switch (orderType.intValue()){
@@ -262,6 +259,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");
         }
+        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+        //修改路段顺序号
+        i += utilsService.updateOrderLineSequence(map);
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
     }

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

@@ -161,6 +161,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         map.putAll(selectMap);
         map.put("orderNumber", substring);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
         //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
@@ -169,6 +170,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 2:
             case 3:
+                //查询司机是否已确认订单 如果订单未确认 则不允许出厂
+                Integer driverConfirmation = utilsMapper.getDriverConfirmation(orderId);
+                if(driverConfirmation == null){
+                    throw new Exception("请提醒司机确认订单！");
+                }
                 i += utilsService.closeOrderNormally(map);
                 break;
             case 4:

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -17,3 +18,26 @@ spring:
       time-to-live: 300000
       cache-null-values: true
 
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  BmsShipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+  QmsFeign:
+    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
+
+server:
+  port: 8008

src/main/resources/application-prod.yml

@@ -1,8 +1,44 @@
+#正式环境
 spring:
   datasource:
-      url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-      password: root123
-      username: dagang
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
+
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-truck-prod
+    name: dil-tms-truck-prod
+  #Redis相关配置
+  redis:
+    host: 172.16.33.161
+    port: 6379
+    password: 123456
+  cache:
+    type: redis
+    redis:
+      time-to-live: 300000
+      cache-null-values: true
+
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  BmsShipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+  QmsFeign:
+    url: ${QMSFEIGN_URL:172.16.33.166:8047}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.161:8055}
+
+server:
+  port: 8088

src/main/resources/bootstrap.yml

@@ -12,51 +12,6 @@ spring:
   mvc:
     static-path-pattern:
 
-
-#feign设置
-openfeign:
-
-  #    正式环境
-  #  ColumnDataFeign:
-  #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  #  BmsShipFeign:
-  #    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  #  BmsTruckFeign:
-  #    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  #  WmshBoundFeign:
-  #    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
-  #  WMSFeign:
-  #    url: ${WMSFEIGN_URL:172.16.33.166:8093}
-  #  OmsFeign:
-  #    url: ${OMSFEIGN_URL:172.16.33.166:8095}
-  #  JoinFeign:
-  #    url: ${JOINFEIGN_URL:172.16.33.166:8066}
-  #  QmsFeign:
-  #    url: ${QMSFEIGN_URL:172.16.33.166:8047}
-  #  ImFeign:
-  #    url: ${IMFEIGN_URL:172.16.33.161:8055}
-
-
-  ##    测试环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-  BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-  BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-  WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-  OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-  JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
-  QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.162:8017}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
-
 #eureka设置
 eureka:
   client:
@@ -123,12 +78,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
-server:
-  #正式环境
-  #  port: 8088
-  #测试环境
-  port: 8008
-
 
 
 

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

@@ -21,7 +21,13 @@
                      RW.WAREHOUSE_NAME          "warehouseName",
                      TRR.INSERT_TIME            "insertTime",
                      TLFR.RESULT_OUT_GATE_TIME  "resultOutGateTime",
-                     OO.INSERT_TIME             "insertTimee"
+                     OO.INSERT_TIME             "insertTimee",
+                     RGEN.GATEPOST_NAME         "enGatepostName",
+                     RGOUT.GATEPOST_NAME        "outGatepostName",
+                     RTCMAO.TRUCK_CALCULATE_NUMBER  "grossCalculateNum",
+                     RTCPI.TRUCK_CALCULATE_NUMBER   "tareCalculateNum",
+                     TWR.RESULT_GROSS_WEIGHT_TIME   "resultGrossWeightTime",
+                     TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
               from OMSTRUCK_ORDER OO
                        left join TMSTRUCK_TOTAL_RESULT TTR
                                  on TTR.ORDER_ID = OO.ORDER_ID
@@ -29,16 +35,24 @@
                                  on RC.CAPACITY_ID = OO.CAPACITY_ID
                        left join TMSTRUCK_ENFACTORY_RESULT TER
                                  on TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+                       left join RMS_GATEPOST RGEN      --进厂门岗
+                                 on RGEN.GATEPOST_ID = TER.GATEPOST_ID
                        left join OMSTRUCK_ORDER_MATERIAL OOM
                                  on OOM.ORDER_ID = OO.ORDER_ID
                        left join TMSTRUCK_WEIGHT_RESULT TWR
                                  on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                       left join RMS_TRUCK_CALCULATE RTCMAO --毛重汽车衡
+                                 on RTCMAO.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+                       left join RMS_TRUCK_CALCULATE RTCPI  --皮重汽车衡
+                                 on RTCPI.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
                        left join TMSTRUCK_UNLOAD_RESULT TUR
                                  on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                        left join RMS_WAREHOUSE RW
                                  on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
                        left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                                  on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                       left join RMS_GATEPOST RGOUT  --出厂门岗
+                                 on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
                        left join TMSTRUCK_RECEIPT_RESULT TRR
                                  on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                        left join TMSTRUCK_QUALITY_RESULT TQR
@@ -161,7 +175,7 @@
                               join RMS_CARRIER RCA
                                 on RCA.CARRIER_ID = RC.CARRIER_ID
                           </if>
-                 where OO.ORDER_TYPE = 1
+                 where OO.ORDER_TYPE in (1, 2)
                           <if test="carrierSsoId != null">
                               and RCA.CARRIER_SSO_ID = #{carrierSsoId}
                           </if>

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

@@ -1140,7 +1140,7 @@
         left join RMS_CONSIGNEE RCON
         on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
 
-        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
+        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE in (1, 2)
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -1267,7 +1267,7 @@
         on RS.SHIPPER_ID = ASO.SHIPPER_ID
         left join RMS_CONSIGNEE RCON
         on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
-        where RESULT_GROSS_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
+        where RESULT_GROSS_WEIGHT_TIME is not null and OO.ORDER_TYPE in (1, 2)
         )
         <where>
             <if test="saleNumber != null">

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

@@ -161,4 +161,11 @@
         from RMS_PERSONNEL RP
         where RP.PERSONNEL_SSO_ID = #{personnelSsoId}
     </select>
+
+<!--  查询订单是否确认  -->
+    <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.DRIVER_CONFIRMATION
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>