From 34183dc3099c654514be1175a3b79dfc07e9bffc Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Sat, 5 Jul 2025 08:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=BA=93=E4=B8=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/storagecheck/StorageCheckServiceImpl.java | 11 +++++++----
 .../src/views/heli/storagelog/printDialog.vue         |  3 ++-
 .../src/views/heli/storagelog/printFinalDialog.vue    |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
index 6f1d915..0fadb21 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
@@ -157,7 +157,7 @@ public class StorageCheckServiceImpl implements StorageCheckService {
         storageDO.setStockInType(stockInType);
         storageDO.setStockNo(UUID.fastUUID().toString(true));
         storageDO.setHeaderNo(storageCheckDO.getStockNo());
-        storageDO.setStatus(1);
+
         storageDO.setDescription(storageCheckDO.getDescription());
         storageDO.setWhId(storageCheckDO.getWhId());
         storageDO.setKeeper(storageCheckDO.getKeeper());
@@ -165,8 +165,11 @@ public class StorageCheckServiceImpl implements StorageCheckService {
         storageDO.setOutbound(storageCheckDO.getKeeper());
         storageDO.setOutboundTime(current);
         storageDO.setDescription("由盘点单号"+storageCheckDO.getStockNo()+"提交产生");
-
-
+        if(stockType == 1){
+            storageDO.setStatus(2);
+        }else{
+            storageDO.setStatus(4);
+        }
         storageMapper.insert(storageDO);
         storageDO.setStockNo(STOCK_IN.getCode(storageDO.getId().toString()));
         storageMapper.updateById(storageDO);
@@ -221,7 +224,7 @@ public class StorageCheckServiceImpl implements StorageCheckService {
                 }
             }
         }
-
+        storageMapper.deleteById(storageDO.getId());
     }
 
     private void saveStorageMat(StorageCheckDO storageCheckDO, Long stockId, Integer stockType){
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
index a015caa..a7b7ade 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
@@ -24,7 +24,7 @@
 <script setup lang="ts">
 import { onMounted, nextTick } from 'vue'
 import JsBarcode from 'jsbarcode'
-
+import printFinalDialog from './printFinalDialog.vue';
 const dialogVisible = ref(false)
 let clauseId = null;
 const startPageNum = ref(0);
@@ -168,6 +168,7 @@ const open = async (vals) => {
     // 创建canvas元素用于生成条形码
     const canvas = document.createElement('canvas')
     JsBarcode(canvas, item.code, {
+          format: "CODE128", 
       width: 2,
       height: 40,
       displayValue: false,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue
index 437a513..7f13670 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue
@@ -162,6 +162,7 @@ const open = async (vals) => {
     // 创建canvas元素用于生成条形码
     const canvas = document.createElement('canvas')
     JsBarcode(canvas, item.code, {
+          format: "CODE128", 
       width: 2,
       height: 40,
       displayValue: false,