From c33e348641b0792df1c0ba086b6a04e6d709efa4 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 10 四月 2025 16:08:05 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 21 +++++----------------
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 7 ++++---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs | 6 +++---
3 files changed, 12 insertions(+), 22 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 4dcadc0..8e811ea 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"
@@ -101,7 +101,7 @@
size: this.size
};
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post(res.data.CZFJiP + '/api/PDA/AGVPage', null).then(res => {
+ this.$u.post(res.data.CZFJiP + '/makerwit/selectKHWareType', null).then(res => {
console.log(res);
this.$t.message.closeLoading();
cb && cb();
@@ -120,6 +120,7 @@
},
});
},
+
clickLoadMore(e) {
this.status = 'loading';
this.current += 1;
@@ -152,7 +153,7 @@
return;
}
let formDataParam = {
- dTaskId: this.generateUUID(),
+ dTaskId: 2,
productCode: productCode,
orderNo: orderNo,
number: availableQuantity > 4 ? 4 : availableQuantity,
@@ -163,7 +164,7 @@
if (res.status) {
const value = uni.getStorageSync('storage_key_ipAddress');
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post(value.CZZJip + '/api/PDA/insertTask', formDataParam).then(res => {
+ this.$u.post(value.CZZJip + '/makerwit/insertTask', formDataParam).then(res => {
this.$t.message.closeLoading();
if (res.code == 200) {
this.$t.message.toast('鍛煎彨鎴愬姛');
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 5700a5e..197706b 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"
@@ -97,18 +97,6 @@
current: this.current,
size: this.size
};
- // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post('http://192.168.31.240:9090/makerwit/selectKHWareType', null).then(res => {
- console.log(res);
- this.$t.message.closeLoading();
- cb && cb();
- if (cb != null) this.listData = [];
- this.listData = [...this.listData, ...res.data];
- console.log(this.listData);
- }).catch((err) => {
- this.$t.message.toast(err.message);
- });
- },
uni.getStorage({
key: 'storage_key_ipAddress',
success: (res) => {
@@ -118,7 +106,8 @@
size: this.size
};
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post(res.data.CZFJiP + '/api/PDA/AGVPage', null).then(res => {
+ // this.$u.post('http://192.168.31.240:9090/makerwit/selectKHWareType', null).then(res => {
+ this.$u.post(res.data.CZFJiP + '/makerwit/selectKHWareType', null).then(res => {
console.log(res);
this.$t.message.closeLoading();
cb && cb();
@@ -170,12 +159,12 @@
return;
}
let formDataParam = {
- dTaskId: this.generateUUID(),
+ dTaskId: 2,
productCode: productCode,
orderNo: orderNo,
number: availableQuantity > 4 ? 4 : availableQuantity,
inputValue: inputValue,
- DTaskId: this.generateUUID(),
+ DTaskId: 2,
ProductCode: productCode,
OrderNo: orderNo,
Number: availableQuantity > 4 ? 4 : availableQuantity,
@@ -188,7 +177,7 @@
if (res.status) {
const value = uni.getStorageSync('storage_key_ipAddress');
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post(value.CZFJiP + '/api/PDA/insertTask', formDataParam).then(res => {
+ this.$u.post(value.CZFJiP + '/makerwit/insertTask', formDataParam).then(res => {
this.$t.message.closeLoading();
console.log(formDataParam);
if (res.code == 200) {
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 e252b49..d209795 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"
@@ -46,17 +46,17 @@
var taskModel = new DtCZTask()
{
TaskTaskID = dto.DTaskId,
- //TaskType = dto.TaskType,
+ TaskType = dto.TaskType,
TaskEndAddress = dto.InputValue,
TaskStatus = TaskInStatusEnum.InNew.ToString(),
CreateDate = DateTime.Now,
TaskStartDate = DateTime.Now,
TaskEndDate = DateTime.Now.AddDays(1),
- //TaskName = dto.TaskType.ToString(),
+ TaskName = dto.TaskType.ToString(),
TaskNumber = dto.Number,
TaskExecutor = "CZ",
TaskOrderNo = dto.OrderNo,
- TaskOwner = "KH",
+ TaskOwner = "KH",
TaskProductCode = dto.ProductCode,
Creater = "KH"
};
--
Gitblit v1.9.3