luobang 2 jaren geleden
bovenliggende
commit
3fd441a1f2

+ 3 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -718,7 +718,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 leaveFactoryByPDA(item);
             }catch (Exception e){
                 e.printStackTrace();
-                tmstruckLeaveFactoryResultMapper.updateOrderStatus(DataChange.dataToBigDecimal(item.get("orderId")));
+                if(DataChange.dataToBigDecimal(item.get("orderType")).compareTo(new BigDecimal(1)) != 0) {
+                    tmstruckLeaveFactoryResultMapper.updateOrderStatus(DataChange.dataToBigDecimal(item.get("orderId")));
+                }
             }
         }
     }

+ 4 - 2
src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1533,7 +1533,8 @@
             OO.ORDER_ID "orderId",
             OO.ORDER_NUMBER || ' ' "orderNumber",
             RG .GATEPOST_ID "gatepostId",
-            RG.GATEPOST_NAME "gatepostName"
+            RG.GATEPOST_NAME "gatepostName",
+            OO.ORDER_TYPE   "orderType"
         FROM TMSTRUCK_WEIGHT_RESULT TWR
                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .RESULT_TOTAL_ID = TWR .RESULT_TOTAL_ID
                  LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID
@@ -1551,7 +1552,8 @@
             OO .PRINTDATE "printDate",
             RG .GATEPOST_ID "gatepostId",
             RC .CAPACITY_NUMBER "capacityNumber",
-            RG.GATEPOST_NAME "gatepostName"
+            RG.GATEPOST_NAME "gatepostName",
+            OO.ORDER_TYPE   "orderType"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_GATEPOST RG ON RG .GATEPOST_NAME = '系统自动补扫出厂'
                  LEFT JOIN RMS_CAPACITY RC ON RC .CAPACITY_ID =OO .CAPACITY_ID