From eca2958d477397eb32c2c0940fd404272ce4d216 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 1 Jun 2023 16:04:46 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/check/impl/StIvtCheckdtlBcpServiceImpl.java       | 2 --
 .../service/check/impl/StIvtCheckmstBcpServiceImpl.java       | 2 +-
 .../semiproduct/semiproductCheck/CheckDialog.vue              | 2 +-
 .../semiproduct/semiproductCheck/ProcessDialog.vue            | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java
index ef8991ab..6272b7aa 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java
@@ -73,8 +73,6 @@ public class StIvtCheckdtlBcpServiceImpl extends ServiceImpl<StIvtCheckdtlBcpMap
                 if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
                 row.setStruct_name(structDao.getStruct_name());
 
-                row.setStoragevehicle_id("999999");
-                row.setStoragevehicle_code("999999");
                 row.setStatus(CHECKEnum.DTL_STATUS.code("生成"));
                 this.save(row);
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
index 0bec93c0..f17b70f0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
@@ -294,7 +294,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
         mol_jo.put("tableData", mol_rows);
         mol_jo.put("auto_confirm", "1");
         //创建损溢单
-        //moreorlessmstBcpService.create(mol_jo);
+        moreorlessmstBcpService.create(mol_jo);
 
 
         dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成"));
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
index f968556c..9129e0ac 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
@@ -196,7 +196,7 @@ export default {
   methods: {
     open() {
       // 查询原材料库的仓库
-      crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
+      crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
         this.storlist = res.content
       })
       check.getCheckDtl({ 'check_id': this.form.check_id }).then(res => {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue
index 24724fb9..e08fb47b 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue
@@ -128,7 +128,7 @@
 
 <script>
 import { crud } from '@crud/crud'
-import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+import check from '@/views/wms/storage_manage/semiproduct/semiproductCheck/check'
 import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
 import ReCheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog'
 
@@ -185,7 +185,7 @@ export default {
   methods: {
     open() {
       // 查询原材料库的仓库
-      crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
+      crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
         this.storlist = res.content
       })
       this.getOutBillDtl()