修改

src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -157,10 +157,10 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     //查询所有待出厂钢材
     List<Map<String,Object>> getSteelForLeave(Map<String,Object> map);
 
-    //出厂
-    int updateLeaveTime(Map<String,Object> map);
-    //关单
-    int updateLeaveOrder(Map<String,Object> map);
+    ////出厂
+    //int updateLeaveTime(Map<String,Object> map);
+    ////关单
+    //int updateLeaveOrder(Map<String,Object> map);
 
     int updateResultTotalOutStatus(BigDecimal resultTotalId);
 

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

@@ -1923,7 +1923,7 @@
        SELECT * FROM (
              SELECT distinct OO.ORDER_ID "orderId",
                     ASO.SALE_ORDER_ID "saleOrderId",
-                    to_char(ASM.SALE_MAKE_DATE,'yyyy/mm/dd HH24:mi')  "saleMakeDate",
+                    to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd HH24:mi')  "saleMakeDate",
                     to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
                     ASO.INSERT_UPDATE_REMARK "saleOrderInertUpdateRemark",
                     ASO.SALE_NUMBER "saleOrderNo",
@@ -2132,7 +2132,17 @@
                         and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
                     </if>
                     <if test="remark != null" >
-                        and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
+                        and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION
+                        || (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
+                        THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+                        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+                        || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
+                        RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
+                        ELSE
+                        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+                        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+                        END)
+                                LIKE #{remark}
                     </if>
                     <if test="easPrimaryId != null">
                         and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
@@ -2427,7 +2437,10 @@
         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
         OO.CAN_WORK     "canwork",
         OO.ORDER_STATUS              "carStatus",
-        RSA.AREA_NAME "areaName",
+        (CASE WHEN ASM.TRANSFER_OUT_OF_WAREHOUSE IS NOT NULL
+            THEN ASM.TRANSFER_OUT_OF_WAREHOUSE
+            ELSE RSA.AREA_NAME
+            END)  "areaName",
         TAR.INSERT_TIME "arrivalTime",
         TRR.INSERT_TIME "receiptTime",
         ASO.sale_remark "saleRemark",
@@ -2446,7 +2459,7 @@
         --计划件数
         ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
         --制单时间
-        to_char(ASM.SALE_MAKE_DATE,'yyyy/mm/dd HH24:mi') "saleMakeDate",
+        to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd HH24:mi') "saleMakeDate",
         --操作人
         OO.RECORD_USERNAME "recordUserName"
         FROM AMS_SALE_ORDER ASO
@@ -2522,7 +2535,16 @@
             and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
         <if test="remark != null" >
-            and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
+            and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION
+            || (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
+            THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+            RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+            || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
+            RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
+            ELSE
+            RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+            RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+            END)  LIKE #{remark}
         </if>
         <if test="salers != null">
             and RSR.SALER_NAME = #{salers}

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

@@ -1078,7 +1078,8 @@
         left join RMS_SHIPPER rsh
         on rsh.SHIPPER_ID = aso.SHIPPER_ID
         where oo.order_number =#{orderNumber}
-        and oo.order_status=5
+        Order by oo.order_id desc
+        fetch first 1 row only
     </select>
 
     <select id="getDeliveryOrderMaterial" parameterType="java.lang.String" resultType="java.util.LinkedHashMap">
@@ -1558,18 +1559,18 @@
         AND #{nowDate} > OO .PRINTDATE
     </select>
 
-    <update id="updateLeaveTime">
-        UPDATE TMSTRUCK_LEAVE_FACTORY_RESULT
-        SET TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_OUT_GATE_TIME = SYSDATE,
-            TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_OUT_MODE = '24h自动补扫出厂'
-        WHERE
-            TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_TOTAL_ID = #{resultTotalId}
-    </update>
-    <update id="updateLeaveOrder">
-        UPDATE OMSTRUCK_ORDER
-        SET ORDER_STATUS = 2
-        WHERE ORDER_ID = #{orderId}
-    </update>
+<!--    <update id="updateLeaveTime">-->
+<!--        UPDATE TMSTRUCK_LEAVE_FACTORY_RESULT-->
+<!--        SET TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_OUT_GATE_TIME = SYSDATE,-->
+<!--            TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_OUT_MODE = '24h自动补扫出厂'-->
+<!--        WHERE-->
+<!--            TMSTRUCK_LEAVE_FACTORY_RESULT.RESULT_TOTAL_ID = #{resultTotalId}-->
+<!--    </update>-->
+<!--    <update id="updateLeaveOrder">-->
+<!--        UPDATE OMSTRUCK_ORDER-->
+<!--        SET ORDER_STATUS = 2-->
+<!--        WHERE ORDER_ID = #{orderId}-->
+<!--    </update>-->
     <update id="updateResultTotalOutStatus" parameterType="java.math.BigDecimal">
         UPDATE TMSTRUCK_TOTAL_RESULT TTR
         SET TTR.ORDER_STATUS = '已出厂',
@@ -1577,9 +1578,14 @@
         where TTR.RESULT_TOTAL_ID = #{resultTotalId}
     </update>
     <select id="getSaleRemark" resultType="java.lang.String" parameterType="decimal">
-        SELECT DISTINCT ASO.SALE_REMARK
+        SELECT
+        (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL
+            THEN ASM.TRANSFER_IN_OF_WAREHOUSE
+            ELSE ASO.SALE_REMARK
+            END)
         FROM AMS_SALE_MATERIAL ASM
         LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
         WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+        fetch first 1 row only
     </select>
 </mapper>