Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

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

@@ -586,13 +586,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
-                && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
-            throw new Exception("钢材订单不允许撤销!");
-        }
-        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
+        //if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
+        //        && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
+        //    throw new Exception("钢材订单不允许撤销!");
+        //}
+        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1 && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
             throw new Exception("撤单失败");
         }
+        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //获取运输订单号
         String orderNumber = (String) mesMap.get("orderNumber");
         //撤销订单的同时删除计量数据
@@ -601,12 +602,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String jsonData = getRequestUtils.doGet(sendUrl);
         System.out.println(jsonData);
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
-        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(7));
-        if(DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
+        if(orderType == 1) {
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+        }
+        if (DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
             omstruckOrder.setOrderStatus(new BigDecimal(4));
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -3209,7 +3209,7 @@
         WHERE OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2
@@ -3241,7 +3241,7 @@
         WHERE OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2
@@ -3290,7 +3290,7 @@
         WHERE OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2
@@ -3326,7 +3326,7 @@
         WHERE OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status != null">
             AND OO.ORDER_STATUS = 2
@@ -3359,11 +3359,12 @@
         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
         WHERE
+        ASO.DELETED = 0
+        and
         OO.ORDER_ID = #{orderId}
-        and ASO.DELETED = 0
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2
@@ -3711,7 +3712,7 @@
         where oo.order_id = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2
@@ -3956,7 +3957,8 @@
         OO.CAN_WORK "canWork",
         OO.ORDER_STATUS "orderStatus",
         ASO.SALE_ORDER_ID   "saleOrderId",
-        OO.DELETED  "orderDeleted"
+        OO.DELETED  "orderDeleted",
+        OO.UPDATE_USERNAME "deleteReason"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -3972,17 +3974,18 @@
         from OMSTRUCK_ORDER OO
         left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
         left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+        where OO.ORDER_STATUS between 4 and 5
         where OO.ORDER_STATUS in (4,5)
         and (OOM.MATERIAL_PRIORITY !=71 OR OOM.MATERIAL_PRIORITY is null)
         and
         RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         ) TEMP ON TEMP."orderId"=OO.ORDER_ID
         WHERE
-        OO.ORDER_ID = #{orderId}
-        AND ASO.DELETED = 0
+        ASO.DELETED = 0
+        AND OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
-            AND OO.ORDER_STATUS in (4, 5, 6)
+            AND OO.ORDER_STATUS between 4 and 6
         </if>
         <if test="status == 2">
             AND OO.ORDER_STATUS = 2

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

@@ -918,7 +918,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_ID = TTR.ORDER_ID
         WHERE OO.ORDER_ID = #{orderId}
-        ORDER BY TWR.RESULT_TARE_WEIGHT DESC)
+        ORDER BY TWR.RESULT_TARE_WEIGHT asc)
         WHERE ROWNUM = 1
     </select>
     <select id="getDueTime" resultType="java.util.Map" parameterType="decimal">

src/main/resources/log4j.properties

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