From e5840d016d209967e6986eff4710133eeb9488a2 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 29 Jun 2023 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                     |  6 +++-
 src/views/modules/board/sopBoard.vue          | 31 +++++++++++--------
 src/views/modules/pad/padPartPhoto.vue        |  6 ++--
 src/views/modules/print/print_stock_label.js  |  7 ++++-
 .../print/print_stock_label_preview.js        |  7 ++++-
 .../modules/production/generateReport.vue     |  6 ++--
 src/views/modules/production/stockPrint.vue   |  1 +
 7 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index fe44a7e..a2895d6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,7 +5,11 @@ export default {
     name: '',
     site: 0,
     languageDefault: '',
-    userDisplay: ''
+    userDisplay: '',
+    padSopUrl:'http://192.168.2.172/upload/',
+    tvSopUrl:'http://192.168.2.172/sopFile/',
+    // padSopUrl:'http://192.168.1.83:81/upload/',
+    // tvSopUrl:'http://192.168.1.83:81/upload/',
   },
   mutations: {
     updateId (state, id) {
diff --git a/src/views/modules/board/sopBoard.vue b/src/views/modules/board/sopBoard.vue
index dac1cdb..68c7954 100644
--- a/src/views/modules/board/sopBoard.vue
+++ b/src/views/modules/board/sopBoard.vue
@@ -33,9 +33,6 @@
 </template>
 
 <script>
-  let rollstop = ''
-  let rolltimer = ''// 自动滚动的定时任务
-  let refresher = '' //数据刷新定时器
   import {
     getSopAddress,
   } from '@/api/board.js'
@@ -66,7 +63,7 @@
         timeOut:30000,
         // packageUrl:'http://192.168.1.130/upload/',
         // packageUrl:'http://192.168.2.172/sopFile/',
-        packageUrl:'http://192.168.1.83:81/upload/',
+        packageUrl:this.$store.state.user.tvSopUrl,
       }
     },
     mounted () {
@@ -76,12 +73,14 @@
     },
     methods: {
       changePdf() {
-        refresher = setInterval(() => {
+        //获取图片数据
+        setInterval(() => {
           this.getPDF();
-        }, 30000)
+        }, 60000)
       },
       changePage() {
-        refresher = setInterval(() => {
+        //刷新图片
+        setInterval(() => {
          this.changePic()
         }, 30000)
         // }, this.timeOut)
@@ -106,6 +105,7 @@
         }
         getSopAddress(data).then(({data}) => {
           if(data.code==0){
+            debugger
             if(data.data.nowSeqNo==null||data.data.nowSeqNo==''){
               this.sopUrl='';
               this.badUrl='';
@@ -120,19 +120,24 @@
               this.seqNo = data.data.nowSeqNo;
               this.sopList=data.sop;
               this.badList=data.bad;
+              console.log("开始打印")
+              console.log(data.sop)
               this.sopPage=1;
               this.badPage=1;
               this.sopMax=data.sop.length;
               this.badMax=data.bad.length;
-              if(data.sop.length>0){
-                this.sopUrl=this.packageUrl+data.sop[0].attaFileNameDb;
+              if(this.sopList.length>0){
+                this.sopUrl=this.packageUrl+this.sopList[0].attaFileNameDb;
               }
-              if(data.bad.length>0){
-                this.badUrl=this.packageUrl+data.bad[0].attaFileNameDb;
+              if(this.badList.length>0){
+                this.badUrl=this.packageUrl+this.badList[0].attaFileNameDb;
               }
             }
-            console.log( this.sopUrl)
-            console.log( this.badUrl)
+            console.log("SOP："+ this.sopUrl)
+            console.log("不良："+ this.badUrl)
+            console.log(this.$store.state.user.tvSopUrl)
+            console.log(this.sopList)
+            console.log("SOP："+ this.sopList[0].attaFileNameDb)
           }else {
             this.sopUrl='';
             this.badUrl='';
diff --git a/src/views/modules/pad/padPartPhoto.vue b/src/views/modules/pad/padPartPhoto.vue
index b8cb7aa..0841867 100644
--- a/src/views/modules/pad/padPartPhoto.vue
+++ b/src/views/modules/pad/padPartPhoto.vue
@@ -92,7 +92,7 @@
           }
           this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
           this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
-          this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+          this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
           // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
         })
       },
@@ -111,7 +111,7 @@
         }
         this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
         this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
-        this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+        this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
         // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
       },
       lastPicture(){
@@ -129,7 +129,7 @@
         }
         this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
         this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
-        this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+        this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
         // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
       },
     },
diff --git a/src/views/modules/print/print_stock_label.js b/src/views/modules/print/print_stock_label.js
index bfe6394..848381d 100644
--- a/src/views/modules/print/print_stock_label.js
+++ b/src/views/modules/print/print_stock_label.js
@@ -46,7 +46,7 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(91,110,138,24,printData.qty+printData.umid);
+      LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:");
@@ -78,6 +78,11 @@ export function printMaterialLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      if(printData.weight!=''&&printData.weight!=0) {
+        LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG');
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+      }
     }
     // LODOP.PRINT_DESIGN();
     // LODOP.PREVIEW();
diff --git a/src/views/modules/print/print_stock_label_preview.js b/src/views/modules/print/print_stock_label_preview.js
index df16c66..c3ad158 100644
--- a/src/views/modules/print/print_stock_label_preview.js
+++ b/src/views/modules/print/print_stock_label_preview.js
@@ -46,7 +46,7 @@ export function printMaterialLabelPreview(printList) {
       LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(91,110,138,24,printData.qty+printData.umid);
+      LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:");
@@ -78,6 +78,11 @@ export function printMaterialLabelPreview(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      if(printData.weight!=''&&printData.weight!=0) {
+        LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG');
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+      }
     }
     // LODOP.PRINT_DESIGN();
     LODOP.PREVIEW();
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index ec01c32..0aa2780 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -932,7 +932,7 @@
           }
           this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
           this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
-          this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+          this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
           // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
         })
       },
@@ -951,7 +951,7 @@
         }
         this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
         this.fileTitle="文件名   ("+this.num+"/"+this.photoDatas.length+")";
-        this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+        this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
         // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
       },
       lastPicture(){
@@ -971,7 +971,7 @@
         }
         this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
         this.fileTitle="文件名   ("+this.num+"/"+this.photoDatas.length+")";
-        this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+        this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
         // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
       },
       openScan(){
diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue
index 681e5ff..22535b7 100644
--- a/src/views/modules/production/stockPrint.vue
+++ b/src/views/modules/production/stockPrint.vue
@@ -258,6 +258,7 @@
           transDate:row.transDate,
           expiredDate:row.expiredDate,
           status:row.status,
+          weight:row.weight
         }
         array.push(data)
         printMaterialLabelPreview(array);