现场问题修改..................

ruoyi-admin/src/main/resources/application.yml

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.ruoyi: error
     org.springframework: warn
 
 # 用户配置

ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml

@@ -105,6 +105,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thePlatoon != null  and thePlatoon != ''"> and the_platoon = #{thePlatoon}</if>
             <if test="theColumn != null  and theColumn != ''"> and the_column = #{theColumn}</if>
             <if test="theFloor != null  and theFloor != ''"> and the_floor = #{theFloor}</if>
+            <if test="trayCodeList != null and trayCodeList.size() > 0">
+                AND tray_code IN
+                <foreach item="trayCode" collection="trayCodeList" open="(" separator="," close=")">
+                    #{trayCode}
+                </foreach>
+            </if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>

ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inOrOut"    column="in_or_out"    />
         <result property="trayCode"    column="tray_code"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
@@ -47,10 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quality"    column="quality"    />
         <result property="managementNo"    column="managementNo"    />
         <result property="departmentId"    column="department_id"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_detail_id, job_id, task_no, status, in_or_out, tray_code,cargo_space_id, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo,department_id from view_in_job_flow vijf
+        select job_detail_id, job_id, task_no, status, in_or_out, tray_code,cargo_space_id,cargo_space_name, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo,department_id,dept_name from view_in_job_flow vijf
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -95,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
             <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
             <if test="departmentId != null  and departmentId != ''"> and (department_id = #{departmentId} or department_id is null or department_id = '')</if>
-            <if test="dateStart != null  and dateStart != ''"> and create_time &gt;= #{dateStart}</if>
-            <if test="dateEnd != null  and dateEnd != ''"> and create_time &lt;= #{dateEnd}</if>
+            <if test="dateStart != null  and dateStart != ''"> and finish_time &gt;= #{dateStart}</if>
+            <if test="dateEnd != null  and dateEnd != ''"> and finish_time &lt;= #{dateEnd}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}

ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare1" column="spare1" />
         <result property="productType" column="productType" />
         <result property="distribution" column="distribution" />
+        <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
@@ -76,12 +77,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bs.out_quantity,
                bs.distribution,  --来源
                bs.spare4,  --来源
+               bs.model,  --来源
+               sd.dept_name,  --来源
                bs.spare1 --用途
         from bas_stock bs
                  left join bas_product bp on bs.product_id = bp.product_id
                  left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
                  left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
                  left join bas_supplier bs2 on bs.phase = bs2.supplier_no
+                    left join sys_dept sd on bs.model = sd.dept_id
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockId != null  and stockId != ''"> and bs.stock_id = #{stockId}</if>
             <if test="model != null  and model != ''"> and (bs.model = #{model} or bs.model is null or bs.model = '')</if>
+            <if test="deptName != null  and deptName != ''"> and sd.dept_name =#{deptName}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
             <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
             <if test="lotNo != null  and lotNo != ''"> and bs.lot_no = #{lotNo}</if>

ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml

@@ -351,10 +351,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id and bs.tray_code = bcs.tray_code
         left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id
         left join bas_product bp on bs.product_id = bp.product_id
+        left join sys_dept sd on bs.model = sd.dept_id
         WHERE bcs.status = '2'
         <if test="model != null and model != ''">
             and (bs.model = #{model} or bs.model is null or bs.model = '')
         </if>
+        <if test="deptName != null and deptName != ''">
+            and sd.dept_name = #{deptName}
+        </if>
         <if test="warehouseId != null and warehouseId != ''">
             and bs.warehouse_id = #{warehouseId}
         </if>