优化页面

ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml

@@ -46,9 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
             <if test="updateId != null and updateId != ''">
                 and warehouse_id != #{updateId}
             </if>

ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml

@@ -14,21 +14,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select stockin_id as id, status, '1' as type
         from in_stockin
         where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
     </select>
 
     <select id="selectStockoutStatusCount" resultMap="BillStatusCountResult">
         select stockout_id as id, status, '2' as type
         from out_stockout
         where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
     </select>
 
     <select id="selectStockcheckStatusCount" resultMap="BillStatusCountResult">
         select stock_check_id as id, status, '3' as type
         from check_stockin
         where status in ('1', '2', '3')
-            ${params.warehouseDataScope}
     </select>
 
 </mapper>

ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml

@@ -8,7 +8,6 @@
         SELECT status, COUNT(*) as count
         FROM bas_cargo_space
         WHERE status IN ('1', '2', '3', '4', '5', '6')
-            ${params.warehouseDataScope}
         GROUP BY status
         ORDER BY status
     </select>

ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml

@@ -8,21 +8,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectStockinFinishCount" resultType="Integer">
         select count(1) from in_stockin_finish
         where 1=1
-        ${params.warehouseDataScope}
     </select>
     
     <!-- 查询已完成出库单数量 -->
     <select id="selectStockoutFinishCount" resultType="Integer">
         select count(1) from out_stockout_finish
         where 1=1
-        ${params.warehouseDataScope}
     </select>
     
     <!-- 查询已完成盘点单数量 -->
     <select id="selectStockcheckFinishCount" resultType="Integer">
         select count(1) from check_stockin_finish
         where 1=1
-        ${params.warehouseDataScope}
     </select>
     
 </mapper>

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -369,9 +369,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spare9,
                mjd.spec,
                mjd.unit,
-               mj.tray_code,
-               mj.warehosue_id
-
+               mj.tray_code
+--                mj.warehosue_id
         from mydo_job_detail mjd
          left join bas_product bp on mjd.product_id = bp.product_id
         left join mydo_job mj on mjd.job_id = mj.job_id

ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml

@@ -100,7 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.warehouseDataScope}
             </if>
         </where>
-        order by mj.create_time desc
+        <if test="orderByColumn != null and orderByColumn != ''">
+            order by ${orderByColumn} ${isAsc}
+        </if>
+        <if test="orderByColumn == null or orderByColumn == ''">
+            order by mj.create_time desc
+        </if>
     </select>
 
     <select id="selectMydoJobFinishListByMydoJob" parameterType="MydoJob" resultMap="MydoJobFinishResult">
@@ -144,7 +149,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.warehouseDataScope}
             </if>
         </where>
-        order by mj.create_time desc
+        <if test="orderByColumn != null and orderByColumn != ''">
+            order by ${orderByColumn} ${isAsc}
+        </if>
     </select>
 
     <select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -94,11 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
         </where>
-             order by mj.create_time desc
+        <if test="orderByColumn != null and orderByColumn != ''">
+            order by ${orderByColumn} ${isAsc}
+        </if>
+        <if test="orderByColumn == null or orderByColumn == ''">
+            order by mj.create_time desc
+        </if>
     </select>
 
     <select id="selectMydoJobByJobId" parameterType="String" resultMap="MydoJobResult">

ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml

@@ -121,8 +121,7 @@
 
     <select id="ktpout" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_tp_out(
-                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_num,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}

ruoyi-admin/src/main/resources/mapper/system/InStockinDetailNFinishMapper.xml

@@ -41,10 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="smNum"    column="sm_num"    />
+        <result property="finishNum"    column="finish_num"    />
     </resultMap>
 
     <sql id="selectInStockinDetailNFinishVo">
-        select erp_detail_id, stockin_guid, stockin_id, product_name, product_model, unit, unit_price, aux_unit, attr1, attr2, quantity, in_quantity, aux_quantity, total_price, cost_unit_price, cost_total_price, accounting_cost_total, accounting_quantity, accounting_status, batch_no, serial_no, production_date, expiry_date, arrival_date, remark, custom1, custom2, custom3, custom4, custom5, custom6, stevedore, order_src, create_time, update_time, stockin_detail_id from in_stockin_detail_n_finish
+        select erp_detail_id, stockin_guid, stockin_id, product_name, product_model, unit, unit_price, aux_unit, attr1, attr2, quantity, in_quantity, aux_quantity, total_price, cost_unit_price, cost_total_price, accounting_cost_total, accounting_quantity, accounting_status, batch_no, serial_no, production_date, expiry_date, arrival_date, remark, custom1, custom2, custom3, custom4, custom5, custom6, stevedore, order_src, create_time, update_time, stockin_detail_id ,sm_num , finish_num from in_stockin_detail_n_finish
     </sql>
 
     <select id="selectInStockinDetailNFinishList" parameterType="InStockinDetailNFinish" resultMap="InStockinDetailNFinishResult">