From 6791f7427cd364bb621b24cb033d315edcfad40e Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 10 九月 2024 08:18:37 +0800
Subject: [PATCH] 解决冲突
---
Web/src/views/device/sortPallet/index.vue | 8 +++++++-
Web/src/views/device/wcsOderTask/component/editDialog.vue | 4 ++--
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs | 1 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
index 8099e82..fe8996e 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
@@ -18,4 +18,5 @@
/// 鎬荤鏁�/璁″垝绠辨暟/棰勪及绠辨暟
/// </summary>
public int? Qty { get; set; }
+ public string? LineNO { get; set; }
}
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index 1612713..9e7f4ad 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -39,6 +39,9 @@
<el-form-item label="鐗╂枡鍚嶇О">
<el-input v-model="deviceInfo.skuName" readonly></el-input>
</el-form-item>
+ <el-form-item label="鍒嗘嫞绾跨紪鍙�">
+ <el-input v-model="deviceInfo.lineNO" readonly></el-input>
+ </el-form-item>
<el-form-item label="缁戝畾鐘舵��">
<el-input :value="deviceInfo.status === '0' ? '鏈粦瀹�' : '宸茬粦瀹�'" readonly></el-input>
</el-form-item>
@@ -59,7 +62,7 @@
</el-form-item>
</el-form>
</div>
- <div class="otherButtonfix">
+ <div v-if="!deviceInfo.text.includes('鎷嗗灈')" class="otherButtonfix">
<el-form label-position="left">
<el-form-item>
<el-button type="primary" @click="openBindDialog(deviceInfo.id)">缁戝畾</el-button>
@@ -274,5 +277,8 @@
justify-content: flex-end;
margin-top: 20px;
}
+ .divDisplay{
+ display:none
+ }
</style>
\ No newline at end of file
diff --git a/Web/src/views/device/wcsOderTask/component/editDialog.vue b/Web/src/views/device/wcsOderTask/component/editDialog.vue
index 29bd0c4..d0d0468 100644
--- a/Web/src/views/device/wcsOderTask/component/editDialog.vue
+++ b/Web/src/views/device/wcsOderTask/component/editDialog.vue
@@ -71,7 +71,7 @@
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鐘舵��" prop="status">
<el-select clearable v-model="ruleForm.status" placeholder="璇烽�夋嫨鐘舵��">
<el-option v-for="(item,index) in dl('TaskStatusEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
@@ -80,7 +80,7 @@
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鏄惁鍥為鎴愬姛" prop="isSuccess">
<el-select clearable v-model="ruleForm.isSuccess" placeholder="璇烽�夋嫨鏄惁鍥為鎴愬姛">
--
Gitblit v1.8.0