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

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

@@ -2350,6 +2350,8 @@
         (CASE
             WHEN BDO.DETAILS_ID IS NULL and TLFR.RESULT_OUT_GATE_TIME is not null
             THEN null
+            WHEN BDO.PRICE_VALUE IS NOT NULL
+            THEN ROUND(BDO.PRICE_VALUE,2)
             WHEN ACTP.PRICE_VALUE IS NOT NULL
             THEN ROUND(ACTP.PRICE_VALUE,2)
             ELSE ROUND(ACTP2.PRICE_VALUE,2)
@@ -2401,6 +2403,8 @@
         ASO.sale_remark "saleRemark",
         DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
         BDO.PRICEIDS "priceIds",
+        BDO.REMARK "detailsRemark",
+        BDO.PHOTO "photo",
         --理重
         ASM.MATERIAL_WEIGHT "materialWeight",
         --收款客户
@@ -2668,6 +2672,8 @@
         (CASE
         WHEN BDO.DETAILS_ID IS NULL and TLFR.RESULT_OUT_GATE_TIME is not null
         THEN null
+        WHEN BDO.PRICE_VALUE IS NOT NULL
+        THEN ROUND(BDO.PRICE_VALUE,2)
         WHEN ACTP.PRICE_VALUE IS NOT NULL
         THEN ROUND(ACTP.PRICE_VALUE,2)
         ELSE ROUND(ACTP2.PRICE_VALUE,2)

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

@@ -778,7 +778,7 @@
     <update id="updateLineId">
         UPDATE OMSTRUCK_ORDER
         SET LINE_ID=#{lineId},
-        ORDER_STATUS = '修改线路ID'
+        INSERT_UPDATE_REMARK = '修改线路ID'
         <if test="orderStatus!=null">
             ,ORDER_STATUS=#{orderStatus}
         </if>