【库存盘点】仓库，库区，库位取消必填项验证1

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagelog/StorageLogController.java

@@ -129,8 +129,8 @@ public class StorageLogController {
     @GetMapping("/all")
     @Operation(summary = "获得全部库存数据")
     @PreAuthorize("@ss.hasPermission('biz:storage-log:query')")
-    public CommonResult<List<StorageLogNowDO>> getStorageNowList(@Valid StorageNowAllReqVO queryReqVO) {
-        List<StorageLogNowDO> pageResult = storageLogService.getStorageNowList(queryReqVO);
+    public CommonResult<PageResult<StorageLogNowDO>> getStorageNowList(@Valid StorageNowAllReqVO queryReqVO) {
+        PageResult<StorageLogNowDO> pageResult = storageLogService.getStorageNowList(queryReqVO);
         return success(pageResult);
     }
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagelog/vo/StorageNowAllReqVO.java

@@ -8,7 +8,7 @@ import lombok.ToString;
 
 @Schema(description = "管理后台 - 入/出库日志分页 Request VO")
 @Data
-public class StorageNowAllReqVO {
+public class StorageNowAllReqVO extends PageParam{
 
     @Schema(description = "物料编码")
     private String matCode;

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagelogNow/StorageLogNowDO.java

@@ -40,13 +40,13 @@ public class StorageLogNowDO extends BaseDO {
     private String matBrand;
     private String matUnit;
 
-    private Long whId;
+    private String whId;
     private String whName;
 
-    private  Long rgId;
+    private String rgId;
     private String rgName;
 
-    private  Long pnId;
+    private String pnId;
     private String pnName;
 
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagelog/StorageLogNowMapper.java

@@ -61,9 +61,9 @@ public interface StorageLogNowMapper extends BaseMapperX<StorageLogNowDO> {
 
     PageResult<StorageLogNowDO> selectAllPage(StorageLogPageReqVO reqVO);
 
-    List<StorageLogNowDO> selectNoZero(StorageNowAllReqVO reqVO);
+    PageResult<StorageLogNowDO> selectNoZero(StorageNowAllReqVO reqVO);
 
-    List<StorageLogNowDO> selectNowList(StorageNowAllReqVO reqVO);
+    PageResult<StorageLogNowDO> selectNowList(StorageNowAllReqVO reqVO);
 
 
     List<StorageLogNowDO> selectNowByMatPnId(@Param("matId")Long matId,@Param("pnId")Long pnId);

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagelog/StorageLogService.java

@@ -67,7 +67,7 @@ public interface StorageLogService {
 
     List<StorageLogNowDO> selectNowByMatPnId(Long matId,Long pnId);
 
-    List<StorageLogNowDO> getStorageNowList(StorageNowAllReqVO queryReqVO);
+    PageResult<StorageLogNowDO> getStorageNowList(StorageNowAllReqVO queryReqVO);
 
     void createStorageLogBatch(List<StorageLogDO> storageLogDOs);
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagelog/StorageLogServiceImpl.java

@@ -107,7 +107,7 @@ public class StorageLogServiceImpl implements StorageLogService {
     }
 
     @Override
-    public List<StorageLogNowDO> getStorageNowList(StorageNowAllReqVO queryReqVO) {
+    public PageResult<StorageLogNowDO> getStorageNowList(StorageNowAllReqVO queryReqVO) {
         if(queryReqVO.getNoZero().equals(1)){
             // 根据仓库id排除库存为o的物料
             return storageLogNowMapper.selectNoZero(queryReqVO);

mes-module-majoys/mes-module-majoys-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml

@@ -8,7 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-    <resultMap id="StorageLogAllDO" type="com.chanko.yunxi.mes.module.biz.dal.dataobject.storagelogAll.StorageLogAllDO">
+    <resultMap  id="StorageLogAllDO"  type="com.chanko.yunxi.mes.module.biz.dal.dataobject.storagelogNow.StorageLogNowDO">
         <result property="id" column="id"/>
         <result property="whId" column="wh_id"/>
         <result property="rgId" column="rg_id"/>
@@ -42,23 +42,25 @@
                 AND  wh_id = #{whId}
             </if>
         </where>
-        order by mat_code
+        order by mat_code limit #{pageNo},#{pageSize}
     </select>
     <select id="selectNowList"
             parameterType="com.chanko.yunxi.mes.module.biz.controller.admin.storagelog.vo.StorageNowAllReqVO"
-            resultType="com.chanko.yunxi.mes.module.biz.dal.dataobject.storagelogNow.StorageLogNowDO">
+            resultMap="StorageLogAllDO">
         select * from (
-            SELECT distinct mat.deleted, mat.id, mat.creator, mat.updater, mat.create_time, mat.update_time, mat.tenant_id, code AS mat_code, name AS mat_name, a.label AS mat_type, spec AS mat_spec,
-            b.label AS mat_unit, brand AS mat_brand, '' AS wh_id, '' AS wh_name, '' AS rg_id, '' AS rg_name, '' AS pn_id, '' AS pn_name, '' lot_no, short_name, 0 AS storage_ok_qty
-            FROM base_material AS mat
-            left join system_dict_data as a on a.value=mat.material_type and a.dict_type = 'biz_material_type'
-            left join system_dict_data as b on b.value=mat.unit and  b.dict_type = 'biz_material_unit'
-            WHERE virtual_part = 'N' AND mat.status = 1  AND mat.tenant_id = 2
+            select * from v_storage_material_now where wh_id=#{whId}
+        union all
+            select mat.deleted,mat.id,mat.creator,mat.updater,mat.create_time,mat.update_time,mat.tenant_id,code as mat_code,name as mat_name,
+            a.label as mat_type,spec as mat_spec,
+            b.label as mat_unit,
+            brand as mat_brand,'' as wh_id, '' as wh_name,'' as rg_id,'' as rg_name,'' as pn_id,'' as pn_name,''
+            lot_no,short_name,0 as storage_ok_qty
+            from base_material as mat
+            left join system_dict_data as a on a.value=mat.material_type and a.dict_type='biz_material_type'
+            left join system_dict_data as b on b.value=mat.material_type and b.dict_type='biz_material_unit'
+            where virtual_part='N' and mat.status=1 and not exists(select id from v_storage_material_now where wh_id=#{whId} and id=mat.id)
         ) t
         <where>
-            <if test="whId != null and whId != ''">
-                AND (1=1 OR  wh_id = #{whId})
-            </if>
             <if test="matCode != null and matCode != ''">
                 AND  (mat_code like concat('%', #{matCode}, '%') OR mat_name like concat('%', #{matCode}, '%'))
             </if>
@@ -69,7 +71,8 @@
                 AND  mat_spec like concat('%', #{matSpec}, '%')
             </if>
         </where>
-        order by t.mat_code
+
+        order by t.mat_code limit #{pageNo},#{pageSize}
     </select>
     <select id="selectNowByMatPnId" resultType="com.chanko.yunxi.mes.module.biz.dal.dataobject.storagelogNow.StorageLogNowDO">
         select * from v_storage_material_now where id=#{matId} and pn_id=#{pnId} order by mat_code

sql/v1.0.0/2.business/1.structure.sql

@@ -665,7 +665,7 @@ CREATE TABLE `base_customer_feedback` (
 ) ENGINE=InnoDB COMMENT='客户反馈质量申请表';
 
 
-alter table wms_storage_check_mat Modify COLUMN wh_id bigint(20) default null COMMENT '仓库 Id，对应 wms_wh 表中的Id';
+
 alter table wms_storage_check_mat Modify COLUMN rg_id bigint(20) default null COMMENT '库区 Id，对应 wms_rg 表中的Id';
 alter table wms_storage_check_mat Modify COLUMN pn_id bigint(20) default null COMMENT '库区 Id，对应 wms_rg 表中的Id';