From 7b142f95c47f673c4468468406d1d1c01e48ab6e Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 7 Nov 2023 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 309248 -> 317440 bytes
 .../instor/rest/ProductScrapController.java   |  79 +++
 .../instor/service/ProductScrapService.java   |  52 ++
 .../service/impl/ProductScrapServiceImpl.java | 287 +++++++++++
 .../st/instor/wql/QST_IVT_PRODUCTSCRAP.wql    | 112 +++++
 .../wms/st/inStor/productscrap/AddDialog.vue  | 476 ++++++++++++++++++
 .../wms/st/inStor/productscrap/AddDtl.vue     | 231 +++++++++
 .../wms/st/inStor/productscrap/index.vue      | 290 +++++++++++
 .../st/inStor/productscrap/productscrap.js    |  55 ++
 9 files changed, 1582 insertions(+)
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/ProductScrapService.java
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
 create mode 100644 lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
 create mode 100644 lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDtl.vue
 create mode 100644 lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
 create mode 100644 lms/nladmin-ui/src/views/wms/st/inStor/productscrap/productscrap.js

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index e0cc1c651e57681a5203d6f26d4440dd605d2e00..bc5a57a9dbb2f14d99644c6248aea364c27be389 100644
GIT binary patch
delta 18167
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
QO2$+P9-6?lAE+Jv510*UsQ>@~

delta 12355
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
XdKtlIcTdy*`xkNT#JxA1WhMUu$3p5r

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java
new file mode 100644
index 000000000..34025866a
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java
@@ -0,0 +1,79 @@
+package org.nl.wms.st.instor.rest;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.wms.st.instor.service.ProductScrapService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "成品报废审核")
+@RequestMapping("/api/productscrap")
+@Slf4j
+public class ProductScrapController {
+    private final ProductScrapService productScrapService;
+
+    @GetMapping
+    @Log("查询成品报废审核单")
+    @ApiOperation("查询成品报废审核单")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(productScrapService.pageQuery(whereJson, page), HttpStatus.OK);
+    }
+
+    @GetMapping("/getOutBillDtl")
+    @Log("查询明细")
+    @ApiOperation("查询明细")
+    public ResponseEntity<Object> getOutBillDtl(@RequestParam Map whereJson) {
+        return new ResponseEntity<>(productScrapService.getOutBillDtl(whereJson), HttpStatus.OK);
+    }
+
+    @Log("删除")
+    @ApiOperation("删除")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        productScrapService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PutMapping
+    @Log("修改")
+    @ApiOperation("修改")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        productScrapService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @PostMapping()
+    @Log("新增")
+    @ApiOperation("新增")
+    public ResponseEntity<Object> insertDtl(@RequestBody JSONObject whereJson) {
+        productScrapService.insertDtl(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PostMapping("/auditPass")
+    @Log("审核通过")
+    @ApiOperation("审核通过")
+    public ResponseEntity<Object> auditPass(@RequestBody JSONObject whereJson) {
+        productScrapService.auditPass(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PostMapping("/auditOut")
+    @Log("不通过")
+    @ApiOperation("不通过")
+    public ResponseEntity<Object> auditOut(@RequestBody JSONObject whereJson) {
+        productScrapService.auditOut(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/ProductScrapService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/ProductScrapService.java
new file mode 100644
index 000000000..b4452140e
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/ProductScrapService.java
@@ -0,0 +1,52 @@
+package org.nl.wms.st.instor.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+public interface ProductScrapService {
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> pageQuery(Map whereJson, Pageable page);
+
+    /**
+     * 多选删除
+     * @param ids /
+     */
+    void deleteAll(Long[] ids);
+    /**
+     * 新增出库单
+     * @param whereJson /
+     */
+    void insertDtl (JSONObject whereJson);
+    /**
+     * 查询出库单明细
+     * @param whereJson /
+     * @return
+     */
+    JSONArray getOutBillDtl(Map whereJson);
+    /**
+     * 修改出库单
+     * @param whereJson /
+     */
+    void update(JSONObject whereJson);
+
+    /**
+     * 审核通过
+     * @param whereJson /
+     */
+    void auditPass(JSONObject whereJson);
+
+    /**
+     * 不通过
+     * @param whereJson /
+     */
+    void auditOut(JSONObject whereJson);
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
new file mode 100644
index 000000000..d0c1eb0ed
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
@@ -0,0 +1,287 @@
+package org.nl.wms.st.instor.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
+import org.nl.wms.st.inbill.service.CheckOutBillService;
+import org.nl.wms.st.instor.service.ProductScrapService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * PC端成品报废审核
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ProductScrapServiceImpl implements ProductScrapService {
+    private final CheckOutBillService checkOutBillService;
+
+    @Override
+    public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "1");
+        if (StrUtil.isNotEmpty(map.get("bill_code"))) {
+            map.put("bill_code", "%" + map.get("bill_code") + "%");
+        }
+        if (StrUtil.isNotEmpty(map.get("material_code"))) {
+            map.put("material_code", "%" + map.get("material_code") + "%");
+        }
+        if (StrUtil.isNotEmpty(map.get("pcsn"))) {
+            map.put("pcsn", (String) whereJson.get("pcsn"));
+        }
+
+        //获取人员对应的仓库
+        UserStorServiceImpl userStorService = new UserStorServiceImpl();
+        String in_stor_id = userStorService.getInStor();
+
+        if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id);
+
+        JSONObject jo = WQL.getWO("QST_IVT_PRODUCTSCRAP").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "scrap_code desc");
+        return jo;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Long[] ids) {
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("is_delete", "1");
+        for (Long scrap_id : ids) {
+            wo_mst.update(jsonObject,"scrap_id = '"+scrap_id+"'");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertDtl(JSONObject map) {
+        //主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
+
+        JSONArray rows = map.getJSONArray("tableData");
+        map.remove("tableData");
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        String changeinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
+        JSONObject mst_jo = new JSONObject();
+        mst_jo.put("scrap_id", changeinv_id);
+        mst_jo.put("scrap_code", CodeUtil.getNewCode("SCRAP_CODE"));
+        mst_jo.put("biz_date", DateUtil.today());
+        mst_jo.put("stor_id", MapUtil.getStr(map, "stor_id"));
+        mst_jo.put("stor_code", MapUtil.getStr(map, "stor_code"));
+        mst_jo.put("stor_name", MapUtil.getStr(map, "stor_name"));
+        mst_jo.put("bill_status", "10");
+        mst_jo.put("input_optid", currentUserId + "");
+        mst_jo.put("input_optname", nickName);
+        mst_jo.put("input_time", now);
+        mst_jo.put("is_delete", "0");
+        mst_jo.put("detail_count", rows.size());
+
+        //调用明细处理方法
+        JSONObject ret = this.insertDtlByRows(mst_jo, rows);
+        mst_jo.put("total_qty", ret.getDoubleValue("total_qty"));
+        wo_mst.insert(mst_jo);
+    }
+
+    /**
+     * 根据传进来的载具物料明细，查询载具所有库存记录，并生成移库明细
+     *
+     * @param rows
+     */
+    @Transactional(rollbackFor = Exception.class)
+    JSONObject insertDtlByRows(JSONObject jsonMst, JSONArray rows) {
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_ProductScrapDtl");
+
+        //定义返回数据
+        JSONObject ret = new JSONObject();
+        double total_qty = 0;
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject json = rows.getJSONObject(i);
+
+            JSONObject jsonDtl = new JSONObject();
+            jsonDtl.put("scrapdtl_id", IdUtil.getSnowflake(1, 1).nextId());
+            jsonDtl.put("scrap_id", jsonMst.getLongValue("scrap_id"));
+            jsonDtl.put("seq_no", i);
+            jsonDtl.put("material_id", json.getLongValue("material_id"));
+            jsonDtl.put("pcsn", json.getString("pcsn"));
+            jsonDtl.put("package_box_sn", json.getString("storagevehicle_code"));
+            jsonDtl.put("fail_source", json.getString("fail_source"));
+            jsonDtl.put("qty_unit_id", json.getString("qty_unit_id"));
+            jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
+            jsonDtl.put("qty", json.getDoubleValue("qty"));
+            jsonDtl.put("remark", json.getString("remark"));
+            wo_dtl.insert(jsonDtl);
+
+            total_qty = NumberUtil.add(total_qty, json.getDoubleValue("qty"));
+
+        }
+        ret.put("total_qty", total_qty);
+        return ret;
+    }
+
+    @Override
+    public JSONArray getOutBillDtl(Map whereJson) {
+        whereJson.put("flag", "2");
+        JSONArray jo = WQL.getWO("QST_IVT_PRODUCTSCRAP")
+                .addParamMap((HashMap) whereJson)
+                .process()
+                .getResultJSONArray(0);
+        return jo;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(JSONObject whereJson) {
+        //主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
+        //主表
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_ProductScrapDtl");
+
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        String scrap_id = (String) whereJson.get("scrap_id");
+        //查询主表
+        JSONObject jo_mst = wo_mst.query("scrap_id='" + scrap_id + "'").uniqueResult(0);
+
+        //删除所有明细
+        wo_dtl.delete("scrap_id = '"+scrap_id+"'");
+
+        //获取明细
+        JSONArray rows = whereJson.getJSONArray("tableData");
+        //调用明细处理方法
+        JSONObject ret = this.insertDtlByRows(jo_mst, rows);
+        jo_mst.put("remark", whereJson.get("remark"));
+        jo_mst.put("biz_date", whereJson.get("biz_date"));
+        jo_mst.put("detail_count", rows.size());
+        jo_mst.put("total_qty", ret.getString("total_qty"));
+        jo_mst.put("update_optid", currentUserId + "");
+        jo_mst.put("update_optname", nickName);
+        jo_mst.put("update_time", now);
+        //更新主表
+        wo_mst.update(jo_mst);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void auditPass(JSONObject whereJson) {
+        /*
+         * 1.校验此些子卷是否都在库内并没有被锁定
+         * 2.生成出库单
+         * 3.更新单据
+         */
+        WQLObject mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
+        WQLObject dtl = WQLObject.getWQLObject("ST_IVT_ProductScrapDtl");
+        WQLObject ivt = WQLObject.getWQLObject("st_ivt_structivt");
+
+        // 查询所有明细
+        JSONArray dtlArr = dtl.query("scrap_id = '" + whereJson.getString("scrap_id") + "'").getResultJSONArray(0);
+
+        // 查询库存中这些子卷是否存在
+        String pcsnJoining = dtlArr.stream()
+                .map(row -> JSON.parseObject(row.toString()))
+                .map(row -> row.getString("pcsn"))
+                .collect(Collectors.joining("','"));
+
+        List<JSONObject> ivtList = ivt.query("pcsn in ('" + pcsnJoining + "') and canuse_qty > 0")
+                .getResultJSONArray(0).toJavaList(JSONObject.class);
+
+        if (dtlArr.size() != ivtList.size()) throw new BadRequestException("库存异常请检查!");
+
+        // 校验库存
+        boolean is_pass = ivtList.stream()
+                .allMatch(row -> pcsnJoining.contains(row.getString("pcsn")));
+
+        if (!is_pass) throw new BadRequestException("库存异常请检查!");
+
+       /* List<String> collect = ivtList.stream()
+                .filter(row -> !pcsnJoining.contains(row.getString("pcsn")))
+                .map(row -> row.getString("pcsn"))
+                .collect(Collectors.toList());
+
+        if (ObjectUtil.isNotEmpty(collect)) {
+            throw new BadRequestException("子卷："+collect.toString()+"异常请检查!");
+        }*/
+
+        // 生成出库单
+        JSONObject jsonOutMst = new JSONObject();
+        jsonOutMst.put("stor_id",whereJson.getString("stor_id"));
+        jsonOutMst.put("stor_code", whereJson.getString("stor_code"));
+        jsonOutMst.put("stor_name", whereJson.getString("stor_name"));
+        jsonOutMst.put("detail_count", ivtList.size());
+        jsonOutMst.put("bill_status", "10");
+        jsonOutMst.put("create_mode", "03");
+        jsonOutMst.put("biz_date", DateUtil.now());
+        jsonOutMst.put("io_type", "1");
+        jsonOutMst.put("buss_type", "1002");
+        jsonOutMst.put("bill_type", "1002");
+        jsonOutMst.put("source_name", "成品报废审核单");
+
+        JSONArray tableData = new JSONArray();
+        for (int i = 0; i < dtlArr.size(); i++) {
+            JSONObject json = dtlArr.getJSONObject(i);
+
+            JSONObject jsonDtl = new JSONObject();
+            jsonDtl.put("pcsn", json.getString("pcsn"));
+            jsonDtl.put("box_no", json.getString("package_box_sn"));
+            jsonDtl.put("material_id", json.getString("material_id"));
+            jsonDtl.put("qty_unit_id", json.getLongValue("qty_unit_id"));
+            jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
+            jsonDtl.put("plan_qty", json.getDoubleValue("qty"));
+            tableData.add(jsonDtl);
+        }
+
+        // 调用出库新增并分配
+        jsonOutMst.put("tableData", tableData);
+        String iostorinv_id = checkOutBillService.insertDtl(jsonOutMst);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("iostorinv_id", iostorinv_id);
+        checkOutBillService.allDiv(jsonObject);
+
+        // 更新主表为完成
+        JSONObject param = new JSONObject();
+        param.put("bill_status", "99");
+        param.put("confirm_optid", SecurityUtils.getCurrentUserId());
+        param.put("confirm_optname", SecurityUtils.getCurrentNickName());
+        param.put("confirm_time", DateUtil.now());
+        mst.update(param,"scrap_id = '"+whereJson.getString("scrap_id")+"'");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void auditOut(JSONObject whereJson) {
+        WQLObject mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
+
+        // 更新主表为完成
+        JSONObject param = new JSONObject();
+        param.put("bill_status", "99");
+        param.put("confirm_optid", SecurityUtils.getCurrentUserId());
+        param.put("confirm_optname", SecurityUtils.getCurrentNickName());
+        param.put("confirm_time", DateUtil.now());
+        mst.update(param,"scrap_id = '"+whereJson.getString("scrap_id")+"'");
+    }
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
new file mode 100644
index 000000000..d3dcb1ca1
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
@@ -0,0 +1,112 @@
+[交易说明]
+	交易名：	成品报废审核分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+    输入.material_code					TYPEAS s_string
+    输入.bill_status					    TYPEAS s_string
+	输入.bill_code					    TYPEAS s_string
+	输入.stor_id					        TYPEAS s_string
+    输入.end_time				        TYPEAS s_string
+    输入.begin_time				        TYPEAS s_string
+    输入.pcsn				            TYPEAS s_string
+    输入.scrap_id				        TYPEAS s_string
+    输入.in_stor_id                      TYPEAS f_string
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT DISTINCT
+            	mst.*
+            FROM
+                ST_IVT_ProductScrapMst mst
+                LEFT JOIN ST_IVT_ProductScrapDtl dtl ON mst.scrap_id = dtl.scrap_id
+            WHERE
+            	1 = 1
+            	AND mst.is_delete = '0'
+            	and mst.stor_id in 输入.in_stor_id
+
+               OPTION 输入.bill_code <> ""
+                  mst.scrap_code like 输入.bill_code
+               ENDOPTION
+
+               OPTION 输入.pcsn <> ""
+                  dtl.pcsn = 输入.pcsn
+               ENDOPTION
+
+               OPTION 输入.stor_id <> ""
+                      mst.stor_id = 输入.stor_id
+               ENDOPTION
+
+               OPTION 输入.bill_status <> ""
+                  mst.bill_status = 输入.bill_status
+               ENDOPTION
+
+               OPTION 输入.begin_time <> ""
+                   mst.input_time >= 输入.begin_time
+               ENDOPTION
+
+               OPTION 输入.end_time <> ""
+                   mst.input_time <= 输入.end_time
+               ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+	 IF 输入.flag = "2"
+        QUERY
+            SELECT DISTINCT
+                dtl.*,
+                dtl.package_box_sn AS storagevehicle_code,
+                mater.material_code,
+                mater.material_name
+            FROM
+            	ST_IVT_ProductScrapDtl dtl
+            	LEFT JOIN ST_IVT_ProductScrapMst mst ON mst.scrap_id = dtl.scrap_id
+            	LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
+            WHERE
+            	1 = 1
+            OPTION 输入.scrap_id <> ""
+                  dtl.scrap_id = 输入.scrap_id
+            ENDOPTION
+
+            OPTION 输入.scrapdtl_id <> ""
+                  dtl.scrapdtl_id = 输入.scrapdtl_id
+            ENDOPTION
+
+            order by dtl.seq_no
+            ENDSELECT
+        ENDQUERY
+    ENDIF
\ No newline at end of file
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
new file mode 100644
index 000000000..07af0dd6f
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
@@ -0,0 +1,476 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span/>
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button
+            icon="el-icon-check"
+            size="mini"
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+          >保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form
+      ref="form"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+      :inline="true"
+      :model="form"
+      :rules="rules"
+      size="mini"
+      label-width="85px"
+      label-suffix=":"
+    >
+      <el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码"/>
+      <el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称"/>
+      <el-form-item label="单据号" prop="scrap_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.scrap_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+          @change="storChange"
+        >
+          <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="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          placeholder="单据状态"
+          class="filter-item"
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in dict.SCRAP_STATUS"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker
+          v-model="form.biz_date"
+          type="date"
+          placeholder="选择日期"
+          style="width: 210px"
+          value-format="yyyy-MM-dd"
+          :disabled="crud.status.view > 0"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input
+          v-model="form.remark"
+          style="width: 380px;"
+          rows="2"
+          type="textarea"
+          :disabled="crud.status.view > 0"
+        />
+      </el-form-item>
+    </el-form>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}" style="margin-top: 5px;">
+      <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
+        <el-form-item label="不合格品缺陷描述" prop="dtl_remark">
+          <el-input v-model="form.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select"/>
+        </el-form-item>
+        <el-form-item label="不合格品来源" prop="fail_source">
+          <el-select
+            v-model="form.fail_source"
+            class="input-with-select"
+            style="width: 210px"
+            :disabled="crud.status.view > 0"
+          >
+            <el-option
+              v-for="item in dict.FAIL_SOURCE"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-button class="filter-item" :disabled="crud.status.view > 0" @click="allSend()" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning">一键填充</el-button>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">不合格品明细</span>
+      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
+
+        <!--左侧插槽-->
+        <slot name="left"/>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加库存物料
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column key="1" type="index" label="序号" width="50" align="center" />
+      <el-table-column key="3" prop="material_code" label="产品编码" width="150" align="center" />
+      <el-table-column key="4" prop="material_name" label="产品名称" align="center" min-width="200" />
+      <el-table-column key="5" prop="storagevehicle_code" label="木箱号" align="center" min-width="150" />
+      <el-table-column key="6" prop="pcsn" label="不合格品批次号" align="center" min-width="150" />
+      <el-table-column
+        key="10"
+        prop="qty"
+        label="不合格品重量(kg)"
+        :formatter="crud.formatNum3"
+        width="140"
+        align="center"
+      />
+      <el-table-column key="7" width="150" prop="fail_source" label="不合格品来源">
+        <template scope="scope">
+          <el-select
+            v-model="scope.row.fail_source"
+            class="input-with-select"
+            @input="custNameInput2(form.tableData[scope.$index])"
+            :disabled="crud.status.view > 0"
+          >
+            <el-option
+              v-for="item in dict.FAIL_SOURCE"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column key="8" width="150" prop="remark" label="不合格品缺陷描述">
+        <template scope="scope">
+          <el-input v-model="scope.row.remark" @input="custNameInput(form.tableData[scope.$index])" :disabled="crud.status.view > 0" class="input-with-select" />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged"/>
+    <StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import AddDtl from '@/views/wms/st/inStor/productscrap/AddDtl'
+import productscrap from '@/views/wms/st/inStor/productscrap/productscrap'
+import StructDiv from '@/views/wms/pub/StructDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+
+const defaultForm = {
+  bill_code: '',
+  stor_id: '',
+  stor_code: '',
+  stor_name: '',
+  bill_status: '10',
+  total_qty: '0',
+  detail_count: '0',
+  remark: '',
+  fail_source: '',
+  biz_date: new Date(),
+  dtl_remark: '',
+  tableData: []
+}
+export default {
+  name: 'AddDialog',
+  components: { AddDtl, StructDiv },
+  mixins: [crud(), form(defaultForm)],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['SCRAP_STATUS', 'FAIL_SOURCE'],
+  data() {
+    return {
+      dialogVisible: false,
+      dtlShow: false,
+      structShow: false,
+      structShow2: false,
+      flagnow: false,
+      nowrow: {},
+      nowindex: '',
+      storlist: [],
+      invtypelist: [],
+      storId: null,
+      rules: {
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudUserStor.getUserStor().then(res => {
+        this.storlist = res
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      productscrap.getOutBillDtl({ 'scrap_id': this.form.scrap_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          this.$set(row, 'edit', true)
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      productscrap.getOutBillDtl({ 'scrap_id': this.form.scrap_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          this.$set(row, 'edit', true)
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    storChange(row) {
+      this.storlist.forEach((item) => {
+        if (item.stor_id === row) {
+          this.form.stor_code = item.stor_code
+          this.form.stor_name = item.stor_name
+        }
+      })
+    },
+    custNameInput(val) {
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (this.form.tableData[i].storagevehicle_code === val.storagevehicle_code) {
+          this.$set(this.form.tableData[i], 'remark', val.remark)
+          this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
+        }
+      }
+    },
+    custNameInput2(val) {
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (this.form.tableData[i].storagevehicle_code === val.storagevehicle_code) {
+          this.$set(this.form.tableData[i], 'fail_source', val.fail_source)
+          this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
+        }
+      }
+    },
+    async queryDtl() {
+      if (!this.form.stor_id) {
+        return this.crud.notify('请先选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      this.storId = this.form.stor_id
+      this.dtlShow = true
+    },
+    allSend() {
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        this.$set(this.form.tableData[i], 'remark', this.form.dtl_remark)
+        this.$set(this.form.tableData[i], 'fail_source', this.form.fail_source)
+
+        this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
+      }
+    },
+    tableChanged(rows) {
+      const tablemap = new Map()
+      rows.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          this.flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].stockrecord_id === item.stockrecord_id) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            this.$set(item, 'edit', false)
+            this.$set(item, 'work_status', '10')
+            this.$set(item, 'turnin_sect_id', '')
+            this.$set(item, 'turnin_struct_id', '')
+            this.$set(item, 'turnin_sect_code', '')
+            this.$set(item, 'turnin_sect_name', '')
+            this.$set(item, 'turnin_struct_code', '')
+            this.$set(item, 'turnin_struct_name', '')
+            tablemap.set(item.stockrecord_id, item)
+          }
+        } else {
+          this.$set(item, 'edit', false)
+          this.$set(item, 'work_status', '10')
+          this.$set(item, 'turnin_sect_id', '')
+          this.$set(item, 'turnin_struct_id', '')
+          this.$set(item, 'turnin_sect_code', '')
+          this.$set(item, 'turnin_sect_name', '')
+          this.$set(item, 'turnin_struct_code', '')
+          this.$set(item, 'turnin_struct_name', '')
+          tablemap.set(item.stockrecord_id, item)
+        }
+      })
+      for (const value of tablemap.values()) {
+        this.form.tableData.push(value)
+      }
+      this.form.detail_count = this.form.tableData.length
+    },
+    structChanged(row) {
+      debugger
+      let structflag = false
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if ((this.form.tableData[i].turnin_struct_id === row.struct_id) || (this.form.tableData[i].turnout_struct_id === row.struct_id)) {
+          structflag = true
+        }
+      }
+      if (structflag) {
+        this.crud.notify('该货位已被设置，不允许重复设置！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (this.form.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) {
+          this.form.tableData[i].turnin_struct_id = row.struct_id
+          this.form.tableData[i].turnin_struct_code = row.struct_code
+          this.form.tableData[i].turnin_struct_name = row.struct_name
+
+          this.form.tableData[i].turnin_sect_id = row.sect_id
+          this.form.tableData[i].turnin_sect_code = row.sect_code
+          this.form.tableData[i].turnin_sect_name = row.sect_name
+          this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
+        }
+      }
+      console.log(this.form.tableData)
+    },
+    deleteRow(index, rows) {
+      const storagevehicle_code = rows[index].storagevehicle_code
+      let len = rows.length
+      while (len--) {
+        const obj = rows[len]
+        if (storagevehicle_code === obj.storagevehicle_code) {
+          const index = rows.indexOf(obj)
+          if (index > -1) { // 移除找到的指定元素
+            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty)
+            rows.splice(index, 1)
+            this.nowindex = ''
+            this.nowrow = {}
+            this.form.detail_count = this.form.tableData.length
+          }
+        }
+      }
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        const row = this.form.tableData[i]
+        if (!row.fail_source) {
+          this.crud.notify('请选择不合格来源', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDtl.vue
new file mode 100644
index 000000000..a36dcb3ea
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDtl.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog
+    title="库存物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1300px"
+    @close="close"
+    @open="open"
+  >
+    <el-row style="padding-bottom: 5px;">
+      <el-col :span="6">
+        <!-- 搜索 -->
+        <el-cascader
+          placeholder="库区"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          style="width: 200px;"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.remark"
+          clearable
+          size="mini"
+          placeholder="物料"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.package_box_sn"
+          clearable
+          size="mini"
+          placeholder="木箱码"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="子卷批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+    </el-row>
+    <el-row style="padding-bottom: 5px;">
+      <el-col :span="6">
+        <el-input
+          v-model="query.sap_pcsn"
+          clearable
+          size="mini"
+          placeholder="SAP批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.sale_order_name"
+          clearable
+          size="mini"
+          placeholder="销售订单号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6" :offset="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column show-overflow-tooltip prop="turnout_sect_name" label="库区"/>
+      <el-table-column show-overflow-tooltip prop="turnout_struct_code" label="货位" width="110px" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" width="250" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" width="150" />
+      <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" width="120" />
+      <el-table-column show-overflow-tooltip prop="sale_order_name" width="150px" label="销售订单及批次" />
+      <el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" />
+      <el-table-column show-overflow-tooltip prop="customer_description" label="客户描述" width="150"/>
+      <el-table-column show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="110px" />
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/handmovestor/getStructIvt',
+      query: {
+        struct_code: '',
+        remark: '',
+        sect_id: '',
+        stor_id: ''
+      },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    },
+    storId: {
+      type: String
+    }
+  },
+  dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable'],
+  data() {
+    return {
+      dialogVisible: false,
+      opendtlParam: '',
+      sects: [],
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.stor_id = this.storId
+    },
+    open() {
+      crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
+        this.sects = res.content
+      })
+      this.crud.toQuery()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    quality_scodeFormat(row, column) {
+      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+    },
+    ivt_levelFormat(row, column) {
+      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+    },
+    is_activeFormat(row, column) {
+      return this.dict.label.is_usable[row.is_active]
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.crud.query.sect_id = ''
+        this.crud.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = val[1]
+      }
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      handmovestor.getBoxIvt(this.rows).then(res => {
+        this.rows = res
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.rows)
+      })
+    }
+  }
+}
+</script>
+
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
new file mode 100644
index 000000000..6b8a33b65
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
@@ -0,0 +1,290 @@
+<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-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <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-input
+              v-model="query.pcsn"
+              size="mini"
+              clearable
+              placeholder="子卷号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.SCRAP_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :permission="permission"
+          :disabled="confirm_flag"
+          :loading="loading_button"
+          icon="el-icon-check"
+          size="mini"
+          @click="auditPass"
+        >
+          通过
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :permission="permission"
+          :disabled="confirm_flag"
+          icon="el-icon-close"
+          size="mini"
+          @click="auditOut"
+        >
+          不通过
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column
+          v-permission="['admin','ivtchange:del','ivtchange:edit']"
+          label="操作"
+          width="160"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" />
+        <el-table-column prop="scrap_code" label="单据号" :min-width="flexWidth('scrap_code',crud.data,'单据号')">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.scrap_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
+        <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
+        <el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')"/>
+        <el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')"/>
+        <el-table-column label="总重量" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')"/>
+        <el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')"/>
+        <el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')"/>
+        <el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')"/>
+        <el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')"/>
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import productscrap from '@/views/wms/st/inStor/productscrap/productscrap'
+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 AddDialog from '@/views/wms/st/inStor/productscrap/AddDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+
+export default {
+  name: 'Productscrap',
+  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination },
+  cruds() {
+    return CRUD({ title: '成品报废审核', idField: 'scrap_id', url: 'api/productscrap', crudMethod: { ...productscrap },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['SCRAP_STATUS'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      work_flag: true,
+      confirm_flag: true,
+      mstrow: {},
+      currentRow: null,
+      loading_button: false,
+      storlist: []
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    canUd(row) {
+      return row.bill_status !== '10'
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.buss_type = ''
+      this.handleCurrentChange(null)
+    },
+    stateFormat(row) {
+      return this.dict.label.SCRAP_STATUS[row.bill_status]
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      } else {
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        if (current.bill_status === '10') {
+          this.work_flag = false
+        } else {
+          this.work_flag = true
+        }
+        if (current.bill_status !== '99') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.confirm_flag = true
+        this.work_flag = true
+        this.currentRow = {}
+      }
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    auditPass() {
+      this.loading_button = true
+      productscrap.auditPass(this.currentRow).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.loading_button = false
+      }).catch(() => {
+        this.loading_button = false
+      })
+    },
+    auditOut() {
+      productscrap.auditOut(this.currentRow).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/productscrap.js b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/productscrap.js
new file mode 100644
index 000000000..f5d578e96
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/productscrap.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/productscrap',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/productscrap/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/productscrap',
+    method: 'put',
+    data
+  })
+}
+
+export function getOutBillDtl(params) {
+  return request({
+    url: '/api/productscrap/getOutBillDtl',
+    method: 'get',
+    params
+  })
+}
+export function insertDtl(data) {
+  return request({
+    url: '/api/productscrap/insertDtl',
+    method: 'post',
+    data
+  })
+}
+export function auditPass(data) {
+  return request({
+    url: '/api/productscrap/auditPass',
+    method: 'post',
+    data
+  })
+}
+export function auditOut(data) {
+  return request({
+    url: '/api/productscrap/auditOut',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, getOutBillDtl, auditPass, auditOut }