From a97a624c1fb269a059f97629076433c46b4e8b4c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 13 8月 2025 14:42:08 +0800
Subject: [PATCH] //如果是连续打印,则不调用打印服务,解决重复打印的问题 【Editby shaocx,2025-08-13】

---
 LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue |  213 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 199 insertions(+), 14 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
index 4d8b7aa..9a1cd16 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
@@ -93,34 +93,77 @@
                   </text>
                 </u-col>
               </u-row>
+			  <u-row>
+			    <u-col span="12">
+			      <text class="color_80 padding_left25rpx">
+			        <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+			      </text>
+			    </u-col>
+			  </u-row>
               <u-row>
-                <u-col span="8">
+                <u-col span="12">
                   <text class="color_80 padding_left25rpx">
                     閮ㄤ欢鍚嶇О锛� {{ item.detailName }}
                   </text>
                 </u-col>
-                <u-col span="4">
-                  <text class="color_80"> 浣嶇疆锛歿{ item.location }} </text>
+              </u-row>
+              <u-row>
+                <u-col span="12">
+                  <text class="color_80 padding_left25rpx">
+                    浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
+                  </text>
                 </u-col>
               </u-row>
               <u-row>
-                <u-col span="8">
+                <u-col span="12">
                   <text class="color_80 padding_left25rpx">
                     鏉愭枡锛歿{ item.info18 }}
                   </text>
                 </u-col>
-                <u-col span="4">
-                  <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+              </u-row>
+
+              <u-row>
+                <u-col span="12">
+                  <text class="color_80 padding_left25rpx">
+                    <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+                  </text>
                 </u-col>
               </u-row>
               <u-row>
-                <u-col span="8">
+                <u-col span="12">
                   <text class="color_80 padding_left25rpx">
                     鏉夸欢鐘舵�侊細{{ getEnumName(item.upiStatus) }}
                   </text>
                 </u-col>
-                <u-col span="4">
-                  <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+              </u-row>
+			  <u-row>
+			    <u-col span="12">
+			      <text class="color_80 padding_left25rpx">
+			        鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+			      </text>
+			    </u-col>
+			  </u-row>
+              <u-row>
+                <u-col span="12">
+                  <text class="color_80 padding_left25rpx">
+                    <text class="color_80"> 鐢熶骇鍗曞彿锛歿{ item.info5 }} </text>
+                  </text>
+                </u-col>
+              </u-row>
+              <u-row>
+                <u-col span="12">
+                  <text class="color_80 padding_left25rpx">
+                    <text class="color_80">
+                      鍖呰缂栧彿锛歿{ item.packageCode }}</text
+                    >
+                  </text>
+                </u-col>
+              </u-row>
+              <u-row>
+                <u-col span="12">
+                  <text class="color_80 padding_left25rpx">
+                    <text class="color_80"> 鎵规鍙凤細{{ item.planNo }}</text>
+                  </text>
                 </u-col>
               </u-row>
             </view>
@@ -129,7 +172,128 @@
       </u-swipe-action>
     </view>
     <modal-code :rescode="rescode" :resmessage="resmessage" ref="resmodal" />
-   
+    <u-popup
+      v-model="detailshow"
+      border-radius="14"
+      @close="detailshow = false"
+      mode="bottom"
+    >
+      <h2 class="text_align_center padding_bottom18 padding15">淇℃伅</h2>
+      <div style="height: 400px; overflow-y: auto; padding: 0 15rpx">
+        <view class="line flex justify-between">
+          <text class="text-gray">璁㈠崟鍙�</text>
+          <text>{{ materlist.orderId }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">闀�</text>
+          <text>{{ materlist.length }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">瀹�</text>
+          <text>{{ materlist.width }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鍘�</text>
+          <text>{{ materlist.thk }}</text>
+        </view>
+        <!-- <view class="line flex justify-between">
+          <text class="text-gray">琛屽彿</text>
+          <text>{{ materlist.lineNumber }}</text>
+        </view> -->
+        <!-- <view class="line flex justify-between">
+        <text class="text-gray">閮ㄤ欢绾圭悊</text>
+        <text>{{ materlist.Matgrid }}</text>
+      </view> -->
+        <!-- <view class="line flex justify-between">
+        <text class="text-gray">鎵撳瓟璁惧缂栧彿</text>
+        <text>{{ materlist.DRNum }}</text>
+      </view> -->
+
+        <!-- <view class="line flex justify-between">
+          <text class="text-gray">閿垏鍥惧彿</text>
+          <text>{{ materlist.materialIndex }}</text>
+        </view> -->
+
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰X鍧愭爣</text>
+          <text>{{ materlist.machineXCenter }}</text>
+        </view>
+
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰Y鍧愭爣</text>
+          <text>{{ materlist.machineYCenter }}</text>
+        </view>
+
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰Z鍧愭爣</text>
+          <text>{{ materlist.machineZCenter }}</text>
+        </view>
+        <!-- <view class="line flex justify-between">
+          <text class="text-gray">杞悜瑙掑害</text>
+          <text>{{ materlist.rotation }}</text>
+        </view> -->
+        <view class="line flex justify-between">
+          <text class="text-gray">灞傛暟</text>
+          <text>{{ materlist.sequence }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">閿�鍞悎鍚屽崟鍙�</text>
+          <text>{{ materlist.info4 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鐢熶骇鍗曞彿</text>
+          <text>{{ materlist.info5 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">绗嚑鍖�</text>
+          <text>{{ materlist.info6 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">缁忛攢搴楀悕绉�</text>
+          <text>{{ materlist.info7 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">浜у搧鍚嶇О</text>
+          <text>{{ materlist.info8 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰缂栫爜</text>
+          <text>{{ materlist.info9 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">瀹㈡埛鍚嶇О</text>
+          <text>{{ materlist.info10 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鑷彁鎴栧彂璐�</text>
+          <text>{{ materlist.info11 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰閮ㄤ欢鎬绘暟閲�</text>
+          <text>{{ materlist.info12 }}</text>
+        </view>
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰闈㈢Н</text>
+          <text>{{ materlist.info13 }}</text>
+        </view>
+        <!-- <view class="line flex justify-between">
+          <text class="text-gray">閮ㄤ欢鍚嶇О</text>
+          <text>{{ materlist.info14 }}</text>
+        </view> -->
+        <view class="line flex justify-between">
+          <text class="text-gray">閮ㄤ欢鏁伴噺</text>
+          <text>{{ materlist.info15 }}</text>
+        </view>
+        <!-- <view class="line flex justify-between">
+          <text class="text-gray">閮ㄤ欢灏哄</text>
+          <text>{{ materlist.info16 }}</text>
+        </view> -->
+        <view class="line flex justify-between">
+          <text class="text-gray">鍖呰鏈烘鎵嬫棆杞�</text>
+          <text>{{ materlist.info17 }}</text>
+        </view>
+      </div>
+    </u-popup>
     <button-modal
       :issueShow="true"
       issueTitle="閲嶇疆"
@@ -147,7 +311,8 @@
 import {
   WmsOperationTaskSetNG,
   WmsOperationTaskCancelNG,
-  getBhbMaterialList,
+  OneKeyClearUpiQueue,
+  querySingleUpiByUpi,
   getenumDataList,
 } from "@/api/putIn/artificial.js";
 
@@ -165,7 +330,7 @@
       resmessage: "",
       options: [
         {
-          text: "鎵撳嵃",
+          text: "璇︽儏",
           style: {
             backgroundColor: "#fc9f35",
           },
@@ -182,6 +347,8 @@
       gridable: true,
       kwbhAllowed: false,
       enumList: [],
+      areaCodeEnum: [],
+	  upiFlagEnum: [],
     };
   },
   components: {
@@ -194,6 +361,16 @@
     }).then((res) => {
       this.enumList = res.result || [];
     });
+    getenumDataList({
+      EnumName: "AreaCodeEnum",
+    }).then((res) => {
+      this.areaCodeEnum = res.result || [];
+    });
+	getenumDataList({
+	  EnumName: "UpiFlagEnum",
+	}).then((res) => {
+	  this.upiFlagEnum = res.result || [];
+	});
   },
   onLoad() {
     this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -202,6 +379,14 @@
   methods: {
     getEnumName(value) {
       const name = this.enumList.find((item) => item.value === value);
+      return name ? name.name : "";
+    },
+	getUpiFlagEnumName(value) {
+	  const name = this.upiFlagEnum.find((item) => item.value === value);
+	  return name ? name.name : "";
+	},
+    getAreaCodeEnumName(value) {
+      const name = this.areaCodeEnum.find((item) => item.value === value);
       return name ? name.name : "";
     },
     //鑾峰彇鐨勪俊鎭�
@@ -214,7 +399,7 @@
         });
         return;
       }
-      getBhbMaterialList({
+      querySingleUpiByUpi({
         upi: this.warehouse.upi,
       }).then((res) => {
         const result = res.result;
@@ -222,7 +407,7 @@
           uni.showToast({
             title: "鏁版嵁涓嶅瓨鍦�",
             icon: "none",
-            duration: 2000,
+            duration: 5000,
           });
           this.singlist = [];
           return;

--
Gitblit v1.9.3