查询统计修改

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java

@@ -22,12 +22,18 @@ public interface IMydoJobService
     public MydoJob selectMydoJobByJobId(String jobId);
 
     /**
-     * 查询任务表列表
+     * 查询任务表列表 带数据权限
      *
      * @param mydoJob 任务表
      * @return 任务表集合
      */
     public List<MydoJob> selectMydoJobList(MydoJob mydoJob);
+
+    /**
+     * 查询任务表列表
+     * @param mydoJob
+     * @return
+     */
     public List<MydoJob> selectMydoJobListApi(MydoJob mydoJob);
 
     /**
@@ -85,7 +91,18 @@ public interface IMydoJobService
      */
     AjaxResult OuthandInvalidation(String [] jobIds);
 
+    /**
+     * 指定出库
+     * @param stockIds
+     * @param exitId
+     * @return
+     */
     AjaxResult pointOut(String [] stockIds,String exitId);
 
+    /**
+     * 通过托盘码查询
+     * @param trayCode
+     * @return
+     */
     MydoJob selectMydoJobByTrayCode(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.StockSummary.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.StockSummary.mapper.StockSummaryMapper;
@@ -38,6 +40,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService
      * @return 库存汇总
      */
     @Override
+    @DataScope(warehouseAlias = "bw")
     public List<StockSummary> selectStockSummaryList(StockSummary stockSummary)
     {
         return stockSummaryMapper.selectStockSummaryList(stockSummary);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewFlatWarehouseInFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF
      * @return 平库入库流水
      */
     @Override
+    @DataScope(warehouseAlias = "vfwif")
     public List<ViewFlatWarehouseInFlow> selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow)
     {
         return viewFlatWarehouseInFlowMapper.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewFlatWarehouseOutFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu
      * @return 平库出库流水
      */
     @Override
+    @DataScope(warehouseAlias = "vfwof")
     public List<ViewFlatWarehouseOutFlow> selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow)
     {
         return viewFlatWarehouseOutFlowMapper.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewInJobFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
      * @return 入库作业流水
      */
     @Override
+    @DataScope(warehouseAlias = "vijf")
     public List<ViewInJobFlow> selectViewInJobFlowList(ViewInJobFlow viewInJobFlow)
     {
         return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewOutJobFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
      * @return 出库做业务流水
      */
     @Override
+    @DataScope(warehouseAlias = "vojf")
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow)
     {
         return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewStockDetail.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper;
@@ -38,6 +40,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
      * @return 库存明细查询
      */
     @Override
+    @DataScope(warehouseAlias = "vsd")
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail)
     {
         return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewStockSecure.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
@@ -38,6 +40,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
      * @return 安全库存查询
      */
     @Override
+    @DataScope(warehouseAlias = "vss")
     public List<ViewStockSecure> selectViewStockSecureList(ViewStockSecure viewStockSecure)
     {
         return viewStockSecureMapper.selectViewStockSecureList(viewStockSecure);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewStockWarning.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
@@ -38,6 +40,7 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
      * @return 预警库存查询
      */
     @Override
+    @DataScope(warehouseAlias = "vsw")
     public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning)
     {
         return viewStockWarningMapper.selectViewStockWarningList(viewStockWarning);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewStockinHistory.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper;
@@ -38,6 +40,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
      * @return 入库单据历史
      */
     @Override
+    @DataScope(warehouseAlias = "vsh")
     public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
     {
         return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewStockoutHistory.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper;
@@ -38,6 +40,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
      * @return 出库单据历史
      */
     @Override
+    @DataScope(warehouseAlias = "vsh")
     public List<ViewStockoutHistory> selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory)
     {
         return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory);

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewFlatWarehouseInFlowVo">
-        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow
+        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow vfwif
     </sql>
 
     <select id="selectViewFlatWarehouseInFlowList" parameterType="ViewFlatWarehouseInFlow" resultMap="ViewFlatWarehouseInFlowResult">

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewFlatWarehouseOutFlowVo">
-        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow
+        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow vfwof
     </sql>
 
     <select id="selectViewFlatWarehouseOutFlowList" parameterType="ViewFlatWarehouseOutFlow" resultMap="ViewFlatWarehouseOutFlowResult">

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_in_job_flow
+        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_in_job_flow vijf
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">

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

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, customer_name, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_out_job_flow
+        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, customer_name, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_out_job_flow vojf
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">

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

@@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
-        select only_identity,stock_status,product_status, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8,warehouse_name from view_stock_detail
+        select only_identity,stock_status,product_status, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8,warehouse_name
+        from view_stock_detail vsd
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">

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

@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
         <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -57,11 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisCargoArea"    column="this_cargo_area"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectViewStockSecureVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8, remark from view_stock_secure
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_secure vss
     </sql>
 
     <select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
@@ -165,7 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec,</if>
             <if test="unit != null">unit,</if>
             <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -184,7 +181,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null">this_cargo_area,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
-            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null and stockId != ''">#{stockId},</if>
@@ -220,7 +216,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">#{spec},</if>
             <if test="unit != null">#{unit},</if>
             <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -237,7 +232,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">#{groupCoding},</if>
             <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
             <if test="thisCargoArea != null">#{thisCargoArea},</if>
-            <if test="remark != null">#{remark},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
         </trim>
@@ -278,7 +272,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec = #{spec},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
@@ -297,7 +290,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where stock_id = #{stockId}
     </update>

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

@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
         <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -57,11 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisCargoArea"    column="this_cargo_area"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectViewStockWarningVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_warning
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_warning vsw
     </sql>
 
     <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
@@ -165,7 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec,</if>
             <if test="unit != null">unit,</if>
             <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -182,7 +179,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">group_coding,</if>
             <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
             <if test="thisCargoArea != null">this_cargo_area,</if>
-            <if test="remark != null">remark,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
         </trim>
@@ -220,7 +216,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">#{spec},</if>
             <if test="unit != null">#{unit},</if>
             <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -239,7 +234,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null">#{thisCargoArea},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
-            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -278,7 +272,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec = #{spec},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
@@ -297,7 +290,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where stock_id = #{stockId}
     </update>

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

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockinHistoryVo">
-        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name,  unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name,  unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history vsh
     </sql>
 
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">

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

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockoutHistoryVo">
-        select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history
+        select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history vsh
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">

ruoyi-ui/src/lang/zh.js

@@ -3358,7 +3358,9 @@ export default {
     inputWarehouseDesc: '请输入仓库描述',
     inputWarehouseLevel: '请输入仓库级别',
     confirm: '确 定',
-    cancel: '取 消'
+    cancel: '取 消',
+    inOrOutDId: '子出库流水单',
+    inOrOutId: '出库流水单号',
   },
   // ***************平库入库流水*************
   searchViewFlatWarehouseInFlow: {
@@ -3391,7 +3393,9 @@ export default {
     warehouseDesc: '仓库描述',
     warehouseLevel: '仓库级别',
     warehouseType: '仓库类型',
-    available: '是否可用'
+    available: '是否可用',
+    inOrOutDId: '子入库流水单',
+    inOrOutId: '入库流水单号',
   },
   // ***************出库单据历史查询*************
   searchViewStockoutHistory: {

ruoyi-ui/src/views/bas/basCustomer/index.vue

@@ -14,7 +14,14 @@
         <el-input v-model="queryParams.simpleName" :placeholder="$t('basCustomer.inputSimpleName')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('basCustomer.useable')" prop="useable"> <!-- 是否可用 -->
-        <el-input v-model="queryParams.useable" :placeholder="$t('basCustomer.inputUseable')" clearable @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.useable" :placeholder="$t('basCustomer.inputUseable')" clearable>
+          <el-option
+            v-for="dict in dict.type.is_available"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('basCustomer.businessDepartment')" prop="businessDepartment"> <!-- 业务部门 -->
         <el-input v-model="queryParams.businessDepartment" :placeholder="$t('basCustomer.inputBusinessDepartment')" clearable @keyup.enter.native="handleQuery" />
@@ -84,7 +91,11 @@
       <el-table-column :label="$t('basCustomer.customerGroupNo')" align="left" prop="customerGroupNo" /> <!-- 客户基本分类 -->
       <el-table-column :label="$t('basCustomer.customerName')" align="left" prop="customerName" /> <!-- 客户名称 -->
       <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" /> <!-- 客户简称 -->
-      <el-table-column :label="$t('basCustomer.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
+      <el-table-column :label="$t('basCustomer.useable')" align="left" prop="useable" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
+        </template>
+        </el-table-column> <!-- 是否可用 -->
       <el-table-column :label="$t('basCustomer.remark')" align="left" prop="remark" /> <!-- 备注 -->
       <el-table-column :label="$t('basCustomer.businessDepartment')" align="left" prop="businessDepartment" /> <!-- 业务部门 -->
       <el-table-column :label="$t('basCustomer.salesman')" align="left" prop="salesman" /> <!-- 业务员 -->
@@ -135,7 +146,14 @@
           <el-input v-model="form.simpleName" :placeholder="$t('basCustomer.inputSimpleName')" />
         </el-form-item>
         <el-form-item :label="$t('basCustomer.useable')" prop="useable"> <!-- 是否可用 -->
-          <el-input v-model="form.useable" :placeholder="$t('basCustomer.inputUseable')" />
+          <el-select v-model="form.useable" :placeholder="$t('basCustomer.inputUseable')" clearable>
+            <el-option
+              v-for="dict in dict.type.is_available"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('basCustomer.remark')" prop="remark"> <!-- 备注 -->
           <el-input v-model="form.remark" :placeholder="$t('basCustomer.inputRemark')" />
@@ -193,6 +211,7 @@ import { listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, update
 
 export default {
   name: "BasCustomer",
+  dicts:['is_available'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/bas/basSupplier/index.vue

@@ -34,12 +34,15 @@
         />
       </el-form-item>
       <el-form-item :label="$t('BasSupplier.useable')" prop="useable"> <!-- 是否可用 -->
-        <el-input
+        
-          v-model="queryParams.useable"
+        <el-select v-model="queryParams.useable" :placeholder="$t('BasSupplier.inputUseable')" clearable>
-          :placeholder="$t('BasSupplier.inputUseable')"
+          <el-option
-          clearable
+            v-for="dict in dict.type.is_available"
-          @keyup.enter.native="handleQuery"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('BasSupplier.supplierArae')" prop="supplierArae"> <!-- 地区分类 -->
         <el-input
@@ -195,7 +198,11 @@
       <el-table-column :label="$t('BasSupplier.supplierGroupNo')" align="left" prop="supplierGroupNo" /> <!-- 供应商名称 -->
       <el-table-column :label="$t('BasSupplier.supplierName')" align="left" prop="supplierName" /> <!-- 供应商名称 -->
       <el-table-column :label="$t('BasSupplier.simpleName')" align="left" prop="simpleName" /> <!-- 简称 -->
-      <el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
+      <el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
+        </template>
+        </el-table-column> <!-- 是否可用 -->
       <el-table-column :label="$t('BasSupplier.remark')" align="left" prop="remark" /> <!-- 备注 -->
       <el-table-column :label="$t('BasSupplier.supplierArae')" align="left" prop="supplierArae" /> <!-- 地区分类 -->
       <el-table-column :label="$t('BasSupplier.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
@@ -253,7 +260,14 @@
           <el-input v-model="form.simpleName" :placeholder="$t('BasSupplier.inputSimpleName')" />
         </el-form-item>
         <el-form-item :label="$t('BasSupplier.useable')" prop="useable"> <!-- 是否可用 -->
-          <el-input v-model="form.useable" :placeholder="$t('BasSupplier.inputUseable')" />
+          <el-select v-model="form.useable" :placeholder="$t('BasSupplier.inputUseable')" clearable>
+            <el-option
+              v-for="dict in dict.type.is_available"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('BasSupplier.remark')" prop="remark"> <!-- 备注 -->
           <el-input v-model="form.remark" :placeholder="$t('BasSupplier.inputRemark')" />
@@ -308,6 +322,7 @@ import { listBasSupplier, getBasSupplier, delBasSupplier, addBasSupplier, update
 
 export default {
   name: "BasSupplier",
+  dicts:['is_available'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/bas/port/index.vue

@@ -10,12 +10,14 @@
         />
       </el-form-item>
       <el-form-item :label="$t('BasPort.portType')" prop="portType"> <!-- 点位分类 -->
-        <el-input
+        <el-select v-model="queryParams.portType" :placeholder="$t('BasPort.inputPortType')" clearable>
-          v-model="queryParams.portType"
+          <el-option
-          :placeholder="$t('BasPort.inputPortType')"
+            v-for="dict in dict.type.port_type"
-          clearable
+            :key="dict.value"
-          @keyup.enter.native="handleQuery"
+            :label="dict.label"
+            :value="dict.value"
           />
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('BasPort.portDesc')" prop="portDesc"> <!-- 点位描述 -->
         <el-input
@@ -82,7 +84,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('BasPort.id')" align="left" prop="id" /> <!-- id -->
       <el-table-column :label="$t('BasPort.portName')" align="left" prop="portName" /> <!-- 点位名称 -->
-      <el-table-column :label="$t('BasPort.portType')" align="left" prop="portType" /> <!-- 点位分类 -->
+      <el-table-column :label="$t('BasPort.portType')" align="left" prop="portType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.port_type" :value="scope.row.portType"/>
+        </template>
+      </el-table-column> <!-- 点位分类 -->
       <el-table-column :label="$t('BasPort.portDesc')" align="left" prop="portDesc" /> <!-- 点位描述 -->
       <el-table-column :label="$t('BasPort.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
       <el-table-column :label="$t('BasPort.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
@@ -129,7 +135,14 @@
           <el-input v-model="form.portName" :placeholder="$t('BasPort.inputPortName')" />
         </el-form-item>
         <el-form-item :label="$t('BasPort.portType')" prop="portType"> <!-- 点位分类 -->
-          <el-input v-model="form.portType" :placeholder="$t('BasPort.inputPortType')" />
+          <el-select v-model="form.portType" :placeholder="$t('BasPort.inputPortType')" clearable>
+            <el-option
+              v-for="dict in dict.type.port_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('BasPort.portDesc')" prop="portDesc"> <!-- 点位描述 -->
           <el-input v-model="form.portDesc" :placeholder="$t('BasPort.inputPortDesc')" />
@@ -255,7 +268,7 @@ import {listPortProductRel, addPortProductRel, delPortProductRel} from "@/api/ba
 
 export default {
   name: "Port",
-  dicts:['product_port_rel_status'],
+  dicts:['product_port_rel_status','port_type'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue

@@ -51,22 +51,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.createMan')" prop="createMan"> <!-- 创建人 -->
+<!--      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.createMan')" prop="createMan"> &lt;!&ndash; 创建人 &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.createMan"
+<!--          v-model="queryParams.createMan"-->
-          :placeholder="$t('searchViewFlatWarehouseInFlow.inputCreateMan')"
+<!--          :placeholder="$t('searchViewFlatWarehouseInFlow.inputCreateMan')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
+<!--      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.isCurrent')" prop="isCurrent"> &lt;!&ndash; 是否可用 &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.isCurrent"
+<!--          v-model="queryParams.isCurrent"-->
-          :placeholder="$t('searchViewFlatWarehouseInFlow.inputIsCurrent')"
+<!--          :placeholder="$t('searchViewFlatWarehouseInFlow.inputIsCurrent')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item :label="$t('searchViewFlatWarehouseInFlow.productName')" prop="productName"> <!-- 物料名称 -->
         <el-input
           v-model="queryParams.productName"
@@ -75,14 +75,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.spec')" prop="spec"> <!-- 规格 -->
+<!--      <el-form-item :label="$t('searchViewFlatWarehouseInFlow.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.spec"
+<!--          v-model="queryParams.spec"-->
-          :placeholder="$t('searchViewFlatWarehouseInFlow.inputSpec')"
+<!--          :placeholder="$t('searchViewFlatWarehouseInFlow.inputSpec')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="品牌" prop="cargoNo">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.cargoNo"-->
@@ -161,9 +161,12 @@
 
     <el-table v-loading="loading" :data="ViewFlatWarehouseInFlowList" @selection-change="handleSelectionChange">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="入出库类型" align="left" prop="inOrOut" />
+<!--      <el-table-column label="入出库类型" align="left" prop="inOrOut" />-->
-      <el-table-column label="入出库主单据ID" align="left" prop="inOrOutSotckId" />
+      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
-      <el-table-column label="入出库主子单据ID" align="left" prop="inOrOutSotckDetailId" />
+      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutId')" align="left" prop="inOrOutSotckId" />
+      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutDId')" align="left" prop="inOrOutSotckDetailId" />
+      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
+      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
       <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
       <el-table-column :label="$t('basproduct1.netWeightPerUnit')" width="120" align="right" prop="spare2" /><!-- 单件净重 -->
       <el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
@@ -172,36 +175,8 @@
       <el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
       <el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
       <el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
       <el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库id -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseInFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
 
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewFlatWarehouseInFlow:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewFlatWarehouseInFlow:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue

@@ -11,38 +11,6 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="入出库类型" prop="inOrOut">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOut"-->
-<!--          placeholder="请输入入出库类型"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="入出库主单据ID" prop="inOrOutSotckId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutSotckId"-->
-<!--          placeholder="请输入入出库主单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="入出库主子单据ID" prop="inOrOutSotckDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutSotckDetailId"-->
-<!--          placeholder="请输入入出库主子单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料GUID" prop="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料GUID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productId')" prop="productId"> <!-- 物料ID -->
         <el-input
           v-model="queryParams.productId"
@@ -51,70 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="入出库数量" prop="quantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          placeholder="请输入入出库数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.createMan')" prop="createMan"> <!-- 创建人 -->
-        <el-input
-          v-model="queryParams.createMan"
-          :placeholder="$t('searchViewFlatWarehouseOutFlow.inputCreateMan')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库名称" prop="warehouseName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseName"-->
-<!--          placeholder="请输入仓库名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库地址" prop="address">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.address"-->
-<!--          placeholder="请输入仓库地址"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库描述" prop="cDesc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cDesc"-->
-<!--          placeholder="请输入仓库描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库级别" prop="warehouseKind">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseKind"-->
-<!--          placeholder="请输入仓库级别"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
-        <el-input
-          v-model="queryParams.isCurrent"
-          :placeholder="$t('searchViewFlatWarehouseOutFlow.inputIsCurrent')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productName')" prop="productName"> <!-- 物料名称 -->
         <el-input
           v-model="queryParams.productName"
@@ -123,14 +27,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.spec')" prop="spec"> <!-- 规格 -->
-        <el-input
-          v-model="queryParams.spec"
-          :placeholder="$t('searchViewFlatWarehouseOutFlow.inputSpec')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('searchViewFlatWarehouseOutFlow.search') }}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('searchViewFlatWarehouseOutFlow.reset') }}</el-button> <!-- 重置 -->
@@ -138,38 +34,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['search:ViewFlatWarehouseOutFlow:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['search:ViewFlatWarehouseOutFlow:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['search:ViewFlatWarehouseOutFlow:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -184,26 +48,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ViewFlatWarehouseOutFlowList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
-<!--      <el-table-column label="入出库类型" align="center" prop="inOrOut" />-->
+      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutId')" align="left" prop="inOrOutSotckId" />
-<!--      <el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />-->
+      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutDId')" align="left" prop="inOrOutSotckDetailId" />
-<!--      <el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />-->
-<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.creator')" align="left" prop="createMan" /> <!-- 创建人 -->
       <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
       <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.spec')" align="left" prop="spec" /> <!-- 规格 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.brand')" align="left" prop="cargoNo" /> <!-- 品牌 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.unit')" align="left" prop="unit" /> <!-- 单位 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.description')" align="left" prop="remark" /> <!-- 描述 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库ID -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
-      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
       <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
       <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
       <el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
@@ -211,26 +60,8 @@
       <el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
       <el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
       <el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
-
+      <el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
-
+      <el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewFlatWarehouseOutFlow:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewFlatWarehouseOutFlow:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/search/ViewInJobFlow/index.vue

@@ -144,14 +144,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewInJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
+
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewInJobFlow.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 <!--      <el-form-item label="垛型ID" prop="stackingId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stackingId"-->
@@ -323,7 +316,7 @@
       </el-table-column>
       <el-table-column :label="$t('searchViewInJobFlow.taskNo')" align="left" prop="taskNo" />
       <el-table-column :label="$t('searchViewInJobFlow.trayCode')" align="left" prop="trayCode" />
-      <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />
+<!--      <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />-->
       <el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" />
       <el-table-column :label="$t('searchViewInJobFlow.priority')" align="right" prop="priority" />
       <el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">
@@ -334,13 +327,13 @@
       <el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut" />
       <el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="left" prop="entranceId" />
       <el-table-column :label="$t('searchViewInJobFlow.productId')" align="left" prop="productId" />
-      <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />
+<!--      <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />-->
-      <el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />
+<!--      <el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />-->
-      <el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="left" prop="stockStatus">
+<!--      <el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="left" prop="stockStatus">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+<!--          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column :label="$t('searchViewInJobFlow.inQuantity')" align="right" prop="inQuantity" />
       <el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="left" prop="inOrOutId" />
       <el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" />
@@ -349,7 +342,7 @@
       <el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="left" prop="finishTime" width="180" />
       <el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="left" prop="warehouseId" />
       <el-table-column :label="$t('searchViewInJobFlow.productName')" align="left" prop="productName" />
-      <el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />
+<!--      <el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />-->
       <el-table-column :label="$t('searchViewInJobFlow.unit')" align="left" prop="unit" />
       <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
       <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->

ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue

@@ -53,7 +53,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
+<!--      <el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;
         <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewOutJobFlow.selectStockStatus')" clearable>
           <el-option
             v-for="dict in dict.type.stock_status"
@@ -62,7 +62,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <!--      <el-form-item label="巷道ID" prop="roadwayId">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.roadwayId"-->
@@ -161,14 +161,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewOutJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewOutJobFlow.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <!--      <el-form-item label="剁型ID" prop="stackingId">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.stackingId"-->
@@ -323,7 +315,7 @@
       </el-table-column>
       <el-table-column :label="$t('searchViewOutJobFlow.taskNo')" align="left" prop="taskNo"/>
       <el-table-column :label="$t('searchViewOutJobFlow.trayCode')" align="left" prop="trayCode"/>
-      <el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="left" prop="roadwayId"/>
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="left" prop="roadwayId"/>-->
       <el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceId')" align="left" prop="cargoSpaceId"/>
       <el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName"/>
       <el-table-column :label="$t('searchViewOutJobFlow.thePlatoon')" align="left" prop="thePlatoon"/>
@@ -338,15 +330,15 @@
       <el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut"/>
       <el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="left" prop="exitId"/>
       <el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId"/>
-      <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>-->
-      <el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="left" prop="stackingId"/>
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="left" prop="stackingId"/>-->
-      <el-table-column :label="$t('searchViewOutJobFlow.stockStatus')" align="left" prop="stockStatus">
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.stockStatus')" align="left" prop="stockStatus">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+<!--          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column :label="$t('searchViewOutJobFlow.outQuantity')" align="right" prop="outQuantity"/>
-      <el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="right" prop="giveNum"/>
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="right" prop="giveNum"/>-->
       <el-table-column :label="$t('searchViewOutJobFlow.inOrOutId')" align="left" prop="inOrOutId"/>
       <el-table-column :label="$t('searchViewOutJobFlow.inOrOutDId')" align="left" prop="inOrOutDId"/>
       <el-table-column :label="$t('searchViewOutJobFlow.createTime')" align="left" prop="createTime" width="180"/>
@@ -354,7 +346,7 @@
       <el-table-column :label="$t('searchViewOutJobFlow.finishTime')" align="left" prop="finishTime" width="180"/>
       <el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="left" prop="warehouseId"/>
       <el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName"/>
-      <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>
+<!--      <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>-->
       <el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/>
       <el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit"/>
       <el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName"/>

ruoyi-ui/src/views/search/ViewStockSecure/index.vue

@@ -157,7 +157,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('searchViewStockSecure.stockId')" align="left" prop="stockId" />
       <el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" />

ruoyi-ui/src/views/search/ViewStockinHistory/index.vue

@@ -314,10 +314,10 @@
       </el-table-column>
       <el-table-column :label="$t('searchViewStockinHistory.warehouseId')" align="left" prop="warehouseId" />
       <el-table-column :label="$t('searchViewStockinHistory.finishDate')" align="left" prop="finishDate" />
-      <el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="left" prop="erpBill" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="left" prop="erpBill" /> -->
       <el-table-column :label="$t('searchViewStockinHistory.stockSource')" align="left" prop="stockSource" />
       <el-table-column :label="$t('searchViewStockinHistory.departmentNo')" align="left" prop="departmentNo" />
-      <el-table-column :label="$t('searchViewStockinHistory.classNo')" align="left" prop="classNo" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.classNo')" align="left" prop="classNo" /> -->
       <el-table-column :label="$t('searchViewStockinHistory.supplierNo')" align="left" prop="supplierNo" />
       <el-table-column :label="$t('searchViewStockinHistory.supplierName')" align="left" prop="supplierName" />
       <el-table-column :label="$t('searchViewStockinHistory.simpleName')" align="left" prop="simpleName" />
@@ -325,21 +325,21 @@
       <el-table-column :label="$t('searchViewStockinHistory.contactNumber')" align="left" prop="contactNumber" />
       <el-table-column :label="$t('searchViewStockinHistory.address')" align="left" prop="address" />
       <el-table-column :label="$t('searchViewStockinHistory.stockinDetailId')" align="left" prop="stockinDetailId" />
-      <el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="left" prop="lotNo" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="left" prop="lotNo" /> -->
       <el-table-column :label="$t('searchViewStockinHistory.quantity')" align="right" prop="quantity" />
-      <el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="right" prop="quantityX" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="right" prop="quantityX" /> -->
-      <el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="right" prop="quantityJ" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="right" prop="quantityJ" /> -->
       <el-table-column :label="$t('searchViewStockinHistory.assignNum')" align="right" prop="assignNum" />
-      <el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="right" prop="assignNumX" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="right" prop="assignNumX" /> -->
-      <el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="right" prop="assignNumJ" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="right" prop="assignNumJ" /> -->
       <el-table-column :label="$t('searchViewStockinHistory.scanNum')" align="right" prop="scanNum" />
-      <el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="right" prop="scanNumX" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="right" prop="scanNumX" /> -->
-      <el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="right" prop="scanNumJ" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="right" prop="scanNumJ" /> -->
-      <el-table-column :label="$t('searchViewStockinHistory.printDate')" align="left" prop="printDate" width="180">
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.printDate')" align="left" prop="printDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
@@ -348,7 +348,7 @@
       <el-table-column :label="$t('searchViewStockinHistory.productId')" align="left" prop="productId" />
       <el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" />
       <el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" />
-      <el-table-column :label="$t('searchViewStockinHistory.spec')" align="left" prop="spec" />
+      <!-- <el-table-column :label="$t('searchViewStockinHistory.spec')" align="left" prop="spec" /> -->
       <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
       <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
       <el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />

ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue

@@ -95,14 +95,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockoutHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
+
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewStockoutHistory.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('searchViewStockoutHistory.quantity')" prop="quantity"> <!-- 出库数量 -->
         <el-input
           v-model="queryParams.quantity"
@@ -127,22 +120,8 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockoutHistory.erpStockoutId')" prop="erpStockoutId" style="white-space: nowrap"> <!-- ERP出库单ID -->
+
-        <el-input
+
-          v-model="queryParams.erpStockoutId"
-          :placeholder="$t('searchViewStockoutHistory.inputErpStockoutId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockoutHistory.entryid')" prop="entryid"> <!-- 客户编号 -->
-        <el-input
-          v-model="queryParams.entryid"
-          :placeholder="$t('searchViewStockoutHistory.inputEntryid')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('searchViewStockoutHistory.customerName')" prop="customerName"> <!-- 客户名称 -->
         <el-input
           v-model="queryParams.customerName"
@@ -151,22 +130,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockoutHistory.spec')" prop="spec"> <!-- 规格 -->
+
-        <el-input
-          v-model="queryParams.spec"
-          :placeholder="$t('searchViewStockoutHistory.inputSpec')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockoutHistory.brand')" prop="cargoNo"> <!-- 品牌 -->
-        <el-input
-          v-model="queryParams.cargoNo"
-          :placeholder="$t('searchViewStockoutHistory.inputBrand')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 <!--      <el-form-item label="单位" prop="unit">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.unit"-->
@@ -229,18 +193,18 @@
 
     <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
       <el-table-column :label="$t('searchViewStockoutHistory.stockoutDetailId')" align="left" prop="stockoutDetailId" />
       <el-table-column :label="$t('searchViewStockoutHistory.productId')" align="left" prop="productId" />
       <el-table-column :label="$t('searchViewStockoutHistory.productName')" align="left" prop="productName" />
-      <el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="left" prop="lotNo" />
+<!--      <el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="left" prop="lotNo" />-->
+      <el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
       <el-table-column :label="$t('searchViewStockoutHistory.quantity')" align="right" prop="quantity" />
       <el-table-column :label="$t('searchViewStockoutHistory.allotQuantity')" align="right" prop="allotQuantity" />
       <el-table-column :label="$t('searchViewStockoutHistory.assignNum')" align="right" prop="assignNum" />
-      <el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="left" prop="erpStockoutId" />
+<!--      <el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="left" prop="erpStockoutId" />-->
-      <el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="left" prop="entryid" />
+<!--      <el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="left" prop="entryid" />-->
       <el-table-column :label="$t('searchViewStockoutHistory.customerName')" align="left" prop="customerName" />
-      <el-table-column :label="$t('searchViewStockoutHistory.spec')" align="left" prop="spec" />
+<!--      <el-table-column :label="$t('searchViewStockoutHistory.spec')" align="left" prop="spec" />-->
       <el-table-column :label="$t('searchViewStockoutHistory.unit')" align="left" prop="unit" />
       <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
       <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />