Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -617,6 +617,7 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="selectWmsInboundResult" resultType="java.util.LinkedHashMap">
+        select * from (
         SELECT
         wir.INBOUND_ID "inboundId",
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
@@ -627,9 +628,9 @@
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
---         关联炉号
+        -- 关联炉号
         rms.MATERIAL_FURNACE_NUMBER "furnaceNumber",
---                关联物资实际重量
+        -- 关联物资实际重量
         rms.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
         FROM wmsp_inbound_result wir
         LEFT JOIN WMSP_GRID_MATERIAL wgm
@@ -661,6 +662,7 @@
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= wir.inbound_time
         </if>
         ORDER BY wir.inbound_time DESC
+        )
         <where>
             <if test="INBOUND_NUMBER != null">
                 and "INBOUND_NUMBER" in
@@ -768,6 +770,7 @@
         <include refid="orderBy"></include>
     </select>
     <select id="selectWmsInboundResults" resultType="java.util.LinkedHashMap">
+        select * from(
         SELECT
         wir.INBOUND_ID "inboundId",
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
@@ -778,9 +781,9 @@
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
-        --         关联炉号
+        -- 关联炉号
         rms.MATERIAL_FURNACE_NUMBER "furnaceNumber",
-        --                关联物资实际重量
+        -- 关联物资实际重量
         rms.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
         FROM wmsp_inbound_result wir
         LEFT JOIN WMSP_GRID_MATERIAL wgm
@@ -811,6 +814,7 @@
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= wir.inbound_time
         </if>
         ORDER BY wir.inbound_time DESC
+        )
         <where>
             <if test="INBOUND_NUMBER != null">
                 and "INBOUND_NUMBER" in
@@ -918,6 +922,7 @@
         <include refid="orderBy"></include>
     </select>
     <select id="selectWmsReservedResult" resultType="java.util.LinkedHashMap">
+        select * from (
         select
         wir.INBOUND_ID "inboundId",
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
@@ -928,9 +933,9 @@
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
-        --         关联炉号
+        -- 关联炉号
         rms.MATERIAL_FURNACE_NUMBER "furnaceNumber",
-        --                关联物资实际重量
+        -- 关联物资实际重量
         rms.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
 
         from wmsp_inbound_result wir
@@ -957,6 +962,7 @@
         and wir.INBOUND_ISCOMPLETE = 1
         and wgm.UPDATE_TIME is null
         order by wir.inbound_time desc
+        )
         <where>
             <if test="INBOUND_NUMBER != null">
                 and "INBOUND_NUMBER" in
@@ -1075,6 +1081,7 @@
     <!--    select MAX(INBOUND_ID) from wmsp_inbound_result-->
     <!--  </select>-->
     <select id="selectWmsReboundResult" resultType="java.util.LinkedHashMap">
+        select * from (
         select wimr.result_no "result_no",
         rw.warehouse_name "warehouse_name",
         rs.stacking_no "stacking_no",
@@ -1118,6 +1125,7 @@
         where rp1.personnel_id = 6
         and wmsp.result_status_ = 1
         and wir.inbound_type = 2
+        )
         <where>
             <if test="result_no != null">
                 and "result_no" in
@@ -1201,6 +1209,7 @@
         <include refid="orderBy"></include>
     </select>
     <select id="selectWmsIvboundResult" resultType="java.util.Map">
+        select * from(
         select wimr.result_id "resultId",
         wimr.result_no "result_no",
         rw1.warehouse_name "before_warehouse",
@@ -1222,6 +1231,7 @@
         join wmsp_ivbound_make_material wimm
         on wimm.result_id = wimr.result_id
         order by wimr.insert_time desc
+        )
         <where>
             <if test="result_no != null">
                 and "result_no" in
@@ -1257,6 +1267,7 @@
         <include refid="orderBy"></include>
     </select>
     <select id="selectWmsIvboundMaterialResult" resultType="java.util.LinkedHashMap">
+        select * from(
         select
         wimr.result_no "result_no",
         rw1.warehouse_name "before_warehouse",
@@ -1372,6 +1383,7 @@
         where wimm.result_id = #{resultId}
         order by
         wir.inbound_time desc
+        )
         <where>
             <if test="result_no != null">
                 and "result_no" in