修改

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

@@ -224,7 +224,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             }
             //
             try {
-                String url = "https://jl.dasteel.cn:44325/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
+                String url = "http://172.16.33.122:44325/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
                 HTTPRequestUtils.sendGet(url,"utf-8");
             } catch (ParseException e) {
                 e.printStackTrace();

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

@@ -1239,8 +1239,8 @@
                         RC.CONSIGNEE_COMPANY_NAME                            "ReceivUnit",
                         RC2.CAPACITY_NUMBER                                  "carNum",
                         RTC.TRUCK_CALCULATE_NUMBER                           "steelyardNum",
-                        ASO.SALE_REMARK                                      "shipNum",
-                        OO.INSERT_UPDATE_REMARK                              "demo",
+                        ASO.SALE_REMARK                                       "shipNum",
+                        OO.INSERT_UPDATE_REMARK || RL.INSERT_UPDATE_REMARK   "demo",
                         ASM.EAS_PRIMARY_ID                                   "FLID"
                  from OMSTRUCK_ORDER OO
                           left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1265,6 +1265,8 @@
                                     ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                           LEFT JOIN RMS_TRUCK_CALCULATE RTC
                                     ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                          LEFT JOIN RMS_LINE RL
+                                    ON RL.LINE_ID = OO.LINE_ID
                  WHERE OO.ORDER_ID = #{orderId}
              )
         where rownum = 1