From d6bbd8952a4b962e3206e7f62ede763033ec2e1e Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周五, 29 11月 2024 15:11:16 +0800
Subject: [PATCH] 扫码
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 12 +++
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue | 83 ---------------------------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue | 35 ++---------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs | 42 ++++++++++++++
4 files changed, 62 insertions(+), 110 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
index d2c5168..c965bc2 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
@@ -42,7 +42,7 @@
p-id="11360"
></path>
</svg>
- <p class="okText">鑾峰彇鏍囩淇℃伅鎴愬姛锛�</p>
+ <p class="okText">鑾峰彇閮ㄤ欢淇℃伅鎴愬姛锛�</p>
</div>
<div class="" v-show="isSuccess && isSuccess != '鎴愬姛'">
<svg t="1732842594517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4303" width="100" height="100">
@@ -56,14 +56,6 @@
</div>
</div>
<ul>
- <!-- <li>
- <span class="text_left">鏄惁榻愬寘:</span>
- <span class="text_rt"></span>
- </li>
- <li>
- <span class="text_left">鏄惁榻愬:</span>
- <span class="text_rt"></span>
- </li> -->
<li>
<span class="text_left">閮ㄤ欢鏉＄爜:</span>
@@ -84,34 +76,23 @@
<span class="text_rt">{{ tableData.orderId }}</span>
</li>
<li>
- <span class="text_left">绾哥闀�:</span>
- <span class="text_rt">{{ tableData.info1 }}</span>
+ <span class="text_left">闀�:</span>
+ <span class="text_rt">{{ tableData.length }}</span>
</li>
<li>
- <span class="text_left">绾哥瀹�:</span>
- <span class="text_rt">{{ tableData.info2 }}</span>
+ <span class="text_left">瀹�:</span>
+ <span class="text_rt">{{ tableData.width }}</span>
</li>
<li>
- <span class="text_left">info3:</span>
- <span class="text_rt">{{ tableData.info3 }}</span>
+ <span class="text_left">鍘�:</span>
+ <span class="text_rt">{{ tableData.thk }}</span>
</li>
<li>
<span class="text_left">閿�鍞悎鍚屽崟鍙�:</span>
<span class="text_rt">{{ tableData.info4 }}</span>
</li>
- <li>
- <span class="text_left">绗嚑鍖�:</span>
- <span class="text_rt">{{ tableData.info6 }}</span>
- </li>
- <li>
- <span class="text_left">缁忛攢搴楀悕绉�:</span>
- <span class="text_rt">{{ tableData.info7 }}</span>
- </li>
- <li>
- <span class="text_left">浜у搧鍚嶇О:</span>
- <span class="text_rt">{{ tableData.info8 }}</span>
- </li>
+
<li>
<span class="text_left">瀹㈡埛鍚嶇О:</span>
<span class="text_rt">{{ tableData.info10 }}</span>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
index 780da9e..bd0662c 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -11,8 +11,7 @@
ref="materialCodeInput"
clearable=""
placeholder="璇锋壂鍖呰鍙�"
- @input="handleChange"
- @keyup.enter.prevent="handleEnter"
+ @keyup.enter.prevent="handleEnter"
@confirm.enter.prevent="handleEnter"
/>
</el-form-item>
@@ -257,86 +256,6 @@
}
}
-// 鍒楁帓搴�
-const sortChange = async (column: any) => {
- queryParams.value.field = column.prop;
- queryParams.value.order = column.order;
- await handleQuery();
-};
-
-// 鎵撳紑鏂板椤甸潰
-const openAddWmsSubstituteGood = () => {
- editWmsSubstituteGoodTitle.value = '娣诲姞鏇夸唬鍝佺鐞�';
- editDialogRef.value.openDialog({});
-};
-
-// 鎵撳紑鎵撳嵃椤甸潰
-const openPrintWmsSubstituteGood = async (row: any) => {
- printWmsSubstituteGoodTitle.value = '鎵撳嵃鏇夸唬鍝佺鐞�';
-};
-
-// 鎵撳紑缂栬緫椤甸潰
-const openEditWmsSubstituteGood = (row: any) => {
- editWmsSubstituteGoodTitle.value = '缂栬緫鏇夸唬鍝佺鐞�';
- editDialogRef.value.openDialog(row);
-};
-
-// 鍒犻櫎
-const delWmsSubstituteGood = (row: any) => {
- ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(async () => {
- var ret = await deleteWmsSubstituteGood(row);
- if (ret.data.type == 'success') {
- handleQuery();
- ElMessage.success('鍒犻櫎鎴愬姛');
- }
- })
- .catch(() => {});
-};
-
-// 鏀瑰彉椤甸潰瀹归噺
-const handleSizeChange = (val: number) => {
- tableParams.value.pageSize = val;
- handleQuery();
-};
-
-// 鏀瑰彉椤电爜搴忓彿
-const handleCurrentChange = (val: number) => {
- tableParams.value.page = val;
- handleQuery();
-};
-
-// handleQuery();
-
-const rules = {
- // 杩欓噷瀹氫箟琛ㄥ崟楠岃瘉瑙勫垯
- completeSet: [{ required: true, message: '璇烽�夋嫨榻愬', trigger: 'change' }],
- packageSetup: [{ required: true, message: '璇疯緭鍏ラ綈鍖呰缃�', trigger: 'blur' }],
- ngPackage: [{ required: true, message: '璇疯緭鍏g鍖�', trigger: 'blur' }],
-};
-
-const ruleForm = ref({
- id: '',
- completeSet: '',
- packageSetup: '',
- ngPackage: '',
-});
-
-const sourceEnum: any = ref([
- {
- value: 'id',
- text: 'ID',
- },
-]);
-
-const handleChange = (event: Event) => {
- console.log('77777777777');
- handleQuery();
-};
const handleEnter = (event: Event) => {
event.preventDefault(); // 闃绘榛樿浜嬩欢
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
index d1bf68b..f311b76 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -233,7 +233,49 @@
/// </summary>
public string DetailName { get; set; }
+
+ public float Length { get; set; }
+
+ public float Width { get; set; }
+
+ /// <summary>
+ /// 鍘�
+ /// </summary>
+ public float Thk { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ public string? Info4 { get; set; }
+
public string? Info5 { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ public string? Info13 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public string? Info14 { get; set; }
+ /// <summary>
+ /// 閮ㄤ欢鏁伴噺
+ /// </summary>
+ public int? Info15 { get; set; }
public string? Info16 { get; set; }
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index 40fd0b4..552d54a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -448,8 +448,18 @@
DetailName = item.DetailName,
OrderId = item.OrderId,
PlanNo = item.PlanNo,
- Info5= item.Info5,
+ Info5 = item.Info5,
+ Info4 = item.Info4,
+ Info10 = item.Info10,
+ Info11 = item.Info11,
+ Info12= item.Info12,
+ Info13 = item.Info13,
+ Info14 = item.Info14,
+ Info15 = item.Info15,
Info16 = item.Info16,
+ Length = item.Length,
+ Width = item.Width,
+ Thk = item.Thk
});
}
}
--
Gitblit v1.9.3