From 99d9d4ed78eeb7b59c5c2ce314a82765f08a600a Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 15 四月 2025 17:05:54 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 4 +-
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 4 +-
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs | 5 +-
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 6 +-
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/输送线回流.vue | 66 ++++++++++++++++++++++++--------
5 files changed, 59 insertions(+), 26 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
index d0a7e9f..1c279b6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
@@ -179,12 +179,12 @@
this.$refs.popup.close();
// this.submit();
} else {
- this.$t.message.toast(res.msg);
+ this.$t.message.toast(res.message);
}
});
// this.submit();
} else {
- this.$t.message.toast(res.msg);
+ this.$t.message.toast(res.message);
}
}).catch((err) => {
this.$t.message.toast(err.message);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
index c3f79fc..8449e40 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
@@ -199,12 +199,12 @@
this.$refs.popup.close();
// this.submit();
} else {
- this.$t.message.toast(res.msg);
+ this.$t.message.toast(res.message);
}
});
// this.submit();
} else {
- this.$t.message.toast(res.msg);
+ this.$t.message.toast(res.message);
}
}).catch((err) => {
this.$t.message.toast(err.message);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\276\223\351\200\201\347\272\277\345\233\236\346\265\201.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\276\223\351\200\201\347\272\277\345\233\236\346\265\201.vue"
index e159bf1..66258e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\276\223\351\200\201\347\272\277\345\233\236\346\265\201.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\276\223\351\200\201\347\272\277\345\233\236\346\265\201.vue"
@@ -3,17 +3,25 @@
<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
</uni-segmented-control>
<view class="content">
- <view v-if="current === 0" class="headerstyle">
+ <view v-if="current === 0" class="headerstyle">
<view class="itemstyle">
<uni-forms label-width="120">
<uni-forms-item label="璧风偣鍦板潃">
<!-- <uni-easyinput type="text" :focus="!addressFocus" v-model="sourceAddress"
placeholder="璇锋壂鐬勮捣鐐瑰湴鍧�" ref='midInput' @input="inputChangebarcode" /> -->
- <uni-data-select v-model="value" :localdata="rangs"></uni-data-select>
+ <uni-data-select v-model="value" :localdata="rangs"></uni-data-select>
</uni-forms-item>
<uni-forms-item label="缁堢偣鍦板潃">
<uni-easyinput type="text" :focus="!addressFocus" v-model="targetAddress"
placeholder="璇锋壂鎻忕粓鐐瑰湴鍧�" ref='midInput' @input="inputChangebarcode" />
+ </uni-forms-item>
+ <uni-forms-item label="绗竴鎵樼洏鏉＄爜">
+ <uni-easyinput type="text" :focus="!addressFocus" v-model="pallcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
+ ref='midInput' @input="inputChangebarcode" />
+ </uni-forms-item>
+ <uni-forms-item label="绗簩鎵樼洏鏉＄爜">
+ <uni-easyinput type="text" :focus="!addressFocus" v-model="pallcode1" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
+ ref='midInput' @input="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item>
<button @click="inbound" type="primary" size="default"
@@ -31,7 +39,7 @@
const innerAudioContext = uni.createInnerAudioContext();
export default {
data() {
- return {
+ return {
items: ['杈撻�佺嚎鎼繍'],
current: 0,
matTotal: [],
@@ -46,6 +54,9 @@
addressFocus: false,
targetAddress: "",
sourceAddress: "",
+ pallcode: "",
+ pallcode1: "",
+ Exception: "",
address: "",
check: true,
value: "",
@@ -124,27 +135,48 @@
})
},
inbound() {
+ // 鎻愬彇杈撳叆妗嗙殑鍊�
+ const sourceAddress = this.value;
+ const targetAddress = this.targetAddress;
+ // 鎻愬彇宸ュ崟缂栧彿
+ const pallcode =this.pallcode;
+ // 鎻愬彇鍨嬪彿
+ const pallcode1 = this.pallcode1;
+
+ if (sourceAddress == "") {
+ this.$t.message.toast('璇烽�夋嫨璧风偣浣嶇疆');
+ return;
+ }
+ if (targetAddress == "") {
+ this.$t.message.toast('璇锋壂鐬勭粓鐐逛綅缃�');
+ return;
+ }
+ if (pallcode == "") {
+ this.$t.message.toast('璇锋壂鎻忕涓�鎷栫洏鏉＄爜');
+ return;
+ }
+ if (pallcode1 == "") {
+ this.$t.message.toast('璇锋壂鎻忕浜屾嫋鐩樻潯鐮�');
+ return;
+ }
var postData = {
MainData: {
"sourceAddress": this.value,
"targetAddress": this.targetAddress,
+ "Exception": this.pallcode + "," + this.pallcode1
}
}
-
+ // console.log(Exception);
this.$u.post('/api/PDA/EmptyTask', postData).then(res => {
- if (res.code == 200) {
- uni.$showMsg("浠诲姟娣诲姞鎴愬姛");
- this.sourceAddress = "";
- this.targetAddress = "";
- setTimeout(() => {
- // this.materialtype = false;
- }, 200);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
+ this.$t.message.closeLoading();
+ console.log(postData);
+ if (res.code == 200) {
+ this.$t.message.toast('鍛煎彨鎴愬姛');
+ this.$refs.popup.close();
+ // this.submit();
+ } else {
+ this.$t.message.toast(res.message);
+ }
}).catch(err => {
this.$refs.uToast.show({
title: err.message,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
index d485293..fe2d2e1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
@@ -88,7 +88,7 @@
WebResponseContent response = new WebResponseContent();
try
{
- var czTask = BaseDal.QueryFirst(x => x.TaskTaskID == dto.TaskId);
+ var czTask = BaseDal.QueryFirst(x => x.TaskTaskID == dto.TaskId && x.TaskStatus == TaskInStatusEnum.InNew.ToString());
if (czTask == null)
{
response.Error("浠诲姟涓嶅瓨鍦紒");
@@ -162,7 +162,7 @@
{
string Saddress = saveModel.MainData["sourceAddress"].ToString();
string Taddress = saveModel.MainData["targetAddress"].ToString();
-
+ string Exception = saveModel.MainData["Exception"].ToString();
Dt_Task task = _taskRepository.QueryFirst(x => x.SourceAddress == Saddress && x.TaskState == (int)TaskInStatusEnum.InPending && x.TargetAddress == "WaitBind");
if (task == null)
{
@@ -170,6 +170,7 @@
return Task.FromResult(webResponseContent);
}
task.TargetAddress = Taddress;
+ task.ExceptionMessage = Exception;
task.TaskState = (int)TaskInStatusEnum.InNew;
var isTrue = _taskRepository.UpdateData(task);
if (isTrue)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 93f0168..0412eed 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -66,8 +66,8 @@
// 瀹氫箟绾夸綋瀹炵洏鍏ュ簱璇锋眰鐨勫湴鍧�鍜屼换鍔＄被鍨�
var requests = new Dictionary<string, string>
{
- { "DB1002.1093.0", "ZJXL-WLX002" },
- { "DB1002.1493.0", "FJXL-WLX002" }
+ { "DB1002.693.0", "ZJXL-WLX002" },
+ { "DB1002.1093.0", "FJXL-WLX002" }
};
// 瀹氫箟绾夸綋绌虹洏鍥炴祦璇锋眰鐨勫湴鍧�鍜屼换鍔＄被鍨�
@@ -121,7 +121,7 @@
}
// 鏌ヨ浠诲姟绫诲瀷瀵瑰簲鐨刢zTask
- DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType);
+ DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType && x.TaskStatus == TaskInStatusEnum.InFinish.ToString());
if (czTask == null)
{
ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},{taskType}浠诲姟涓嶅瓨鍦紝绋嶅悗閲嶈瘯......");
--
Gitblit v1.9.3