luobang 2 rokov pred
rodič
commit
eea96650d8

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -33,7 +33,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

+ 3 - 1
src/main/resources/com/steerinfo/dil/mapper/OffSiteTransportationMapper.xml

@@ -14,7 +14,9 @@
         update OMSTRUCK_ORDER set TRIP_ID = #{rid} where ORDER_NUMBER = #{orderNumber}
   </update>
     <update id="orderClose">
-        update OMSTRUCK_ORDER set ORDER_STATUS = '2' where ORDER_NUMBER = #{orderNumber}
+        update OMSTRUCK_ORDER set ORDER_STATUS = '2',
+                              INSERT_UPDATE_REMARK = '抵达签收关闭运输订单,offsiteXml18行'
+        where ORDER_NUMBER = #{orderNumber}
     </update>
     
     <select id="getInTransitTransportation" resultType="java.util.Map">

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -19,7 +19,8 @@
 <!--  通过订单Id 或运输订单号 修改 订单状态  -->
     <update id="updateOrderStatusByOrderIdOrNum" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS = #{orderStatus}
+        set OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = 'otms关闭订单,utilsXml23行'
         <where>
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}

+ 1 - 1
src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout