add：原材料、半成品、成品库存变动记录页面

2023-06-25 21:13:57 +08:00
parent 2c4b10ab3a
commit cb78d9a38b
28 changed files with 908 additions and 11 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java
@@ -1,8 +1,16 @@
 package org.nl.wms.storage_manage.basedata.controller.record;


+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;

 /**
@@ -14,8 +22,17 @@ import org.springframework.web.bind.annotation.RestController;
 * @since 2023-05-10
 */
@RestController
-@RequestMapping("/stIvtStructivtflowBcp")
+@RequestMapping("/api/stIvtStructivtflowBcp")
 public class StIvtStructivtflowBcpController {

+    @Autowired
+    private IStIvtStructivtflowService iStIvtStructivtflowService;
+
+    @GetMapping
+    @Log("查询库存变动记录")
+    @ApiOperation("查询库存变动记录")
+    public ResponseEntity<Object> query(IvtFlowQuery query, PageQuery page) {
+        return new ResponseEntity<>(iStIvtStructivtflowService.queryAll(query,page), HttpStatus.OK);
+    }
 }

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java
@@ -1,7 +1,12 @@
 package org.nl.wms.storage_manage.basedata.service.record.dao.mapper;

+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
+
+import java.util.List;
+import java.util.Map;

 /**
 * <p>
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface StIvtStructivtflowBcpMapper extends BaseMapper<StIvtStructivtflow> {

+    List<Map> queryAll(@Param("query") IvtFlowQuery query);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml
@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.basedata.service.record.dao.mapper.StIvtStructivtflowBcpMapper">

+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        ivt.*,
+        mater.material_code,
+        mater.material_name,
+        mater.material_spec,
+        attr.stor_name,
+        attr.stor_name,
+        attr.sect_name,
+        unit.unit_name
+        FROM
+        st_ivt_structivtflow_bcp ivt
+        LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
+        LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
+        <where>
+            1 = 1
+            <if test="query.struct_code != null and query.struct_code  != ''">
+                and (ivt.struct_code LIKE '%${query.struct_code}%' or
+                ivt.struct_name LIKE '%${query.struct_code}%' )
+            </if>
+            <if test="query.material_code != null and query.material_code  != ''">
+                and (mater.material_code LIKE '%${query.material_code}%' or
+                mater.material_name LIKE '%${query.material_code}%' or
+                mater.material_spec LIKE '%${query.material_code}%'
+                )
+            </if>
+            <if test="query.bill_code != null and query.bill_code  != ''">
+                and ivt.bill_code LIKE '%${query.bill_code}%'
+            </if>
+            <if test="query.change_type_scode != null and query.change_type_scode != ''">
+                and ivt.change_type_scode =  #{query.change_type_scode}
+            </if>
+            <if test="query.stor_id != null and query.stor_id != ''">
+                and ivt.stor_id =  #{query.stor_id}
+            </if>
+        </where>
+        order by ivt.change_time desc,ivt.struct_code ASC
+    </select>
+
 </mapper>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java
@@ -1,9 +1,11 @@
 package org.nl.wms.storage_manage.basedata.service.record.service;

 import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;

 /**
 * <p>
@@ -18,4 +20,6 @@ public interface IStIvtStructivtflowService extends IService<StIvtStructivtflow>
    void recordStructivtFlow(StIvtStructivtflowDto flowDto);

    void insetIvtChange(JSONObject json);
+
+    Object queryAll(IvtFlowQuery query, PageQuery page);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
@@ -3,6 +3,10 @@ package org.nl.wms.storage_manage.basedata.service.record.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
@@ -16,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,7 +101,7 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl<StIvtStructivtflo
        dao.setIs_active(json.getBoolean("is_active"));
        dao.setPcsn(json.getString("pcsn"));
        dao.setStor_id(ivtDao.getStor_id());
-        dao.setChange_type_scode(json.getString("change_type_scode"));
+        dao.setChange_type_scode(json.getString("change_type"));
        dao.setChange_time(DateUtil.now());
        dao.setChange_person_id(SecurityUtils.getCurrentUserId());
        dao.setChange_person_name(SecurityUtils.getCurrentNickName());
@@ -109,4 +114,12 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl<StIvtStructivtflo
        dao.setInv_id(json.getString("inv_id"));
        this.save(dao);
    }
+
+    @Override
+    public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java
@@ -1,5 +1,15 @@
 package org.nl.wms.storage_manage.productmanage.controller.structIvt;

+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -12,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController;
 * @since 2023-05-04
 */
@RestController
-@RequestMapping("/stIvtStructivtflowCp")
+@RequestMapping("/api/stIvtStructivtflowCp")
 public class StIvtStructivtflowCpController {

+    @Autowired
+    private IStIvtStructivtflowCpService iStIvtStructivtflowCpService;
+
+    @GetMapping
+    @Log("查询库存变动记录")
+    @ApiOperation("查询库存变动记录")
+    public ResponseEntity<Object> query(IvtFlowQuery query, PageQuery page) {
+        return new ResponseEntity<>(iStIvtStructivtflowCpService.queryAll(query,page), HttpStatus.OK);
+    }
+
 }

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java
@@ -1,7 +1,9 @@
 package org.nl.wms.storage_manage.productmanage.service.structIvt;

 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;

 /**
 * <p>
@@ -13,4 +15,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct
 */
 public interface IStIvtStructivtflowCpService extends IService<StIvtStructivtflowCp> {

+    Object queryAll(IvtFlowQuery query, PageQuery page);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java
@@ -1,7 +1,12 @@
 package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
+
+import java.util.List;
+import java.util.Map;

 /**
 * <p>
@@ -13,4 +18,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct
 */
 public interface StIvtStructivtflowCpMapper extends BaseMapper<StIvtStructivtflowCp> {

+    List<Map> queryAll(@Param("query") IvtFlowQuery query);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml
@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtflowCpMapper">

+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        ivt.*,
+        mater.material_code,
+        mater.material_name,
+        mater.material_spec,
+        attr.stor_name,
+        attr.stor_name,
+        attr.sect_name,
+        unit.unit_name
+        FROM
+        st_ivt_structivtflow_cp ivt
+        LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
+        LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
+        <where>
+            1 = 1
+            <if test="query.struct_code != null and query.struct_code  != ''">
+                and (ivt.struct_code LIKE '%${query.struct_code}%' or
+                     ivt.struct_name LIKE '%${query.struct_code}%' )
+            </if>
+            <if test="query.material_code != null and query.material_code  != ''">
+                and (mater.material_code LIKE '%${query.material_code}%' or
+                     mater.material_name LIKE '%${query.material_code}%' or
+                     mater.material_spec LIKE '%${query.material_code}%'
+                     )
+            </if>
+            <if test="query.bill_code != null and query.bill_code  != ''">
+                and ivt.bill_code LIKE '%${query.bill_code}%'
+            </if>
+            <if test="query.change_type_scode != null and query.change_type_scode != ''">
+                and ivt.change_type_scode =  #{query.change_type_scode}
+            </if>
+            <if test="query.stor_id != null and query.stor_id != ''">
+                and ivt.stor_id =  #{query.stor_id}
+            </if>
+        </where>
+        order by ivt.change_time desc,ivt.struct_code ASC
+    </select>
+
 </mapper>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java
@@ -0,0 +1,33 @@
+package org.nl.wms.storage_manage.productmanage.service.structIvt.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
+
+/*
+ * @author LXY
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class IvtFlowQuery extends BaseQuery<StIvtStructivtCp> {
+
+
+    private String struct_code;
+
+    private String bill_code;
+
+    private String change_type_scode;
+
+    private String material_code;
+
+    private String stor_id;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build());
+    }
+
+
+}
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java
@@ -1,9 +1,14 @@
 package org.nl.wms.storage_manage.productmanage.service.structIvt.impl;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtflowCpMapper;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
 import org.springframework.stereotype.Service;

 /**
@@ -17,4 +22,11 @@ import org.springframework.stereotype.Service;
@Service
 public class StIvtStructivtflowCpServiceImpl extends ServiceImpl<StIvtStructivtflowCpMapper, StIvtStructivtflowCp> implements IStIvtStructivtflowCpService {

+    @Override
+    public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java
@@ -50,7 +50,7 @@ public class StIvtIostorinvYlOutController {
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
    }

-    @PostMapping("/delete")
+    @DeleteMapping
    @Log("删除入库单")
    @ApiOperation("删除入库单")
    public ResponseEntity<Object> delete(@RequestBody Long[] ids){
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java
@@ -1,8 +1,16 @@
 package org.nl.wms.storage_manage.rawmanage.controller.structIvt;


+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
+import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;

 /**
@@ -14,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController;
 * @since 2023-05-10
 */
@RestController
-@RequestMapping("/stIvtStructivtflowYl")
+@RequestMapping("/api/stIvtStructivtflowYl")
 public class StIvtStructivtflowYlController {

+    @Autowired
+    private IStIvtStructivtflowYlService iStIvtStructivtflowYlService;
+
+    @GetMapping
+    @Log("查询库存变动记录")
+    @ApiOperation("查询库存变动记录")
+    public ResponseEntity<Object> query(IvtFlowQuery query, PageQuery page) {
+        return new ResponseEntity<>(iStIvtStructivtflowYlService.queryAll(query,page), HttpStatus.OK);
+    }
+
 }

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvOutYlMapper">

    <select id="getMstDetail" resultType="java.util.Map">
-        SELECT DISTINCT
+        SELECT
        mst.iostorinv_id,
        mst.bill_code,
        mst.io_type,
@@ -56,6 +56,8 @@
            </if>
        </where>

+        order by mst.create_time DESC
+

    </select>
 </mapper>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper">

    <select id="getMstDetail" resultType="java.util.Map">
-        SELECT DISTINCT
+        SELECT
        mst.iostorinv_id,
        mst.bill_code,
        mst.io_type,
@@ -59,6 +59,7 @@
            </if>
        </where>

+        order by mst.create_time DESC

    </select>
 </mapper>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
@@ -143,6 +143,14 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvOu
        String iostorinv_id = form.getString("iostorinv_id");

        StIvtIostorinvYl mst = this.getById(iostorinv_id);
+        mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
+        mst.setDis_id(SecurityUtils.getCurrentUserId());
+        mst.setDis_name(SecurityUtils.getCurrentNickName());
+        mst.setDis_time(DateUtil.now());
+        mst.setConfirm_id(SecurityUtils.getCurrentUserId());
+        mst.setConfirm_name(SecurityUtils.getCurrentNickName());
+        mst.setConfirm_time(DateUtil.now());
+        this.updateById(mst);

        List<StIvtIostorinvdtlYl> dtl_list = iostorinvdtlYlService.list(new QueryWrapper<StIvtIostorinvdtlYl>().eq("iostorinv_id", iostorinv_id));

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java
@@ -233,6 +233,9 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMap
        mst.setConfirm_id(SecurityUtils.getCurrentUserId());
        mst.setConfirm_name(SecurityUtils.getCurrentNickName());
        mst.setConfirm_time(DateUtil.now());
+        mst.setDis_id(SecurityUtils.getCurrentUserId());
+        mst.setDis_name(SecurityUtils.getCurrentNickName());
+        mst.setDis_time(DateUtil.now());
        mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
        this.updateById(mst);

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtflowYlService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtflowYlService.java
@@ -1,6 +1,8 @@
 package org.nl.wms.storage_manage.rawmanage.service.structIvt;

 import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl;
 import com.baomidou.mybatisplus.extension.service.IService;

@@ -16,4 +18,6 @@ public interface IStIvtStructivtflowYlService extends IService<StIvtStructivtflo

    void insetIvtChange(JSONObject json);

+    Object queryAll(IvtFlowQuery query, PageQuery page);
+
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java
@@ -1,8 +1,13 @@
 package org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper;

+import org.apache.ibatis.annotations.Param;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

+import java.util.List;
+import java.util.Map;
+
 /**
 * <p>
 * 仓位库存变动记录表 Mapper 接口
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface StIvtStructivtflowYlMapper extends BaseMapper<StIvtStructivtflowYl> {

+    List<Map> queryAll(@Param("query") IvtFlowQuery query);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml
@@ -2,4 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper">

+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        ivt.*,
+        mater.material_code,
+        mater.material_name,
+        mater.material_spec,
+        attr.stor_name,
+        attr.stor_name,
+        attr.sect_name,
+        unit.unit_name
+        FROM
+        st_ivt_structivtflow_yl ivt
+        LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
+        LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
+        <where>
+            1 = 1
+            <if test="query.struct_code != null and query.struct_code  != ''">
+                and (ivt.struct_code LIKE '%${query.struct_code}%' or
+                ivt.struct_name LIKE '%${query.struct_code}%' )
+            </if>
+            <if test="query.material_code != null and query.material_code  != ''">
+                and (mater.material_code LIKE '%${query.material_code}%' or
+                mater.material_name LIKE '%${query.material_code}%' or
+                mater.material_spec LIKE '%${query.material_code}%'
+                )
+            </if>
+            <if test="query.bill_code != null and query.bill_code  != ''">
+                and ivt.bill_code LIKE '%${query.bill_code}%'
+            </if>
+            <if test="query.change_type_scode != null and query.change_type_scode != ''">
+                and ivt.change_type_scode =  #{query.change_type_scode}
+            </if>
+            <if test="query.stor_id != null and query.stor_id != ''">
+                and ivt.stor_id =  #{query.stor_id}
+            </if>
+        </where>
+        order by ivt.change_time desc,ivt.struct_code ASC
+    </select>
 </mapper>
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java
@@ -2,11 +2,16 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl;

 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService;
@@ -44,7 +49,7 @@ public class StIvtStructivtflowYlServiceImpl extends ServiceImpl<StIvtStructivtf
        dao.setIs_active(json.getBoolean("is_active"));
        dao.setPcsn(json.getString("pcsn"));
        dao.setStor_id(ivtDao.getStor_id());
-        dao.setChange_type_scode(json.getString("change_type_scode"));
+        dao.setChange_type_scode(json.getString("change_type"));
        dao.setChange_time(DateUtil.now());
        dao.setChange_person_id(SecurityUtils.getCurrentUserId());
        dao.setChange_person_name(SecurityUtils.getCurrentNickName());
@@ -57,4 +62,12 @@ public class StIvtStructivtflowYlServiceImpl extends ServiceImpl<StIvtStructivtf
        dao.setInv_id(json.getString("inv_id"));
        this.save(dao);
    }
+
+    @Override
+    public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
 }
--- a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/product/productIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '成品库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowCp',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
--- a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js
+++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowCp',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowCp/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowCp/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '原材料库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowYl',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowYl',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowYl/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowYl/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue
@@ -133,7 +133,7 @@ export default {
    }
  },
  created() {
-    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
      this.storlist = res.content
    })
  },
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="所属仓库"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="变动类型">
+            <el-select
+              v-model="query.change_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.CHANGE_TYPE_SCODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="仓位编码">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码、名称、规格"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
+        <el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
+        <el-table-column show-overflow-tooltip prop="change_qty" label="变动数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="result_qty" label="结存数" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductivtFlow from '@/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow'
+
+export default {
+  name: 'ProductIn',
+  dicts: ['CHANGE_TYPE_SCODE'],
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '半成品库存变动查询',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtflowBcp',
+      crudMethod: { ...ProductivtFlow },
+      props: { size: 20 }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    formatType(row) {
+      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}