From 3311f02194604247c1fb0384ecc43cc3ef3f04be Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 08 六月 2025 20:59:31 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d48a3c6c-f39c-42e9-bd7e-a9ecb962fc09.vsidx | 0
代码管理/ZhongHePDA/pages/basic/cachePoint.vue | 96 ++++++++--------
/dev/null | 0
代码管理/ZhongHePDA/pages/task/AgvTask.vue | 69 +++++-----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 51 +++++++-
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/15173735-4d40-4303-9957-72c73104d72f.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b87d687f-d7bb-4da2-b1ce-f7dcf001b90e.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 76 ++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API请求/2025-06-08/叫料任务下发250608.txt | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 3
代码管理/ZhongHePDA/common/http.interceptor.js | 4
11 files changed, 210 insertions(+), 94 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/15173735-4d40-4303-9957-72c73104d72f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/15173735-4d40-4303-9957-72c73104d72f.vsidx"
new file mode 100644
index 0000000..3f0426e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/15173735-4d40-4303-9957-72c73104d72f.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b562594-4598-4984-b23d-47d2174f2526.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b562594-4598-4984-b23d-47d2174f2526.vsidx"
deleted file mode 100644
index c3874bd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b562594-4598-4984-b23d-47d2174f2526.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/64588fc3-3956-44f9-a94a-b42bcc6d9b8b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/64588fc3-3956-44f9-a94a-b42bcc6d9b8b.vsidx"
deleted file mode 100644
index d2b5b4f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/64588fc3-3956-44f9-a94a-b42bcc6d9b8b.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b059467b-47d8-4c04-b5e8-149638790949.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b059467b-47d8-4c04-b5e8-149638790949.vsidx"
deleted file mode 100644
index 41594e8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b059467b-47d8-4c04-b5e8-149638790949.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b87d687f-d7bb-4da2-b1ce-f7dcf001b90e.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b87d687f-d7bb-4da2-b1ce-f7dcf001b90e.vsidx"
new file mode 100644
index 0000000..a2c1999
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b87d687f-d7bb-4da2-b1ce-f7dcf001b90e.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d48a3c6c-f39c-42e9-bd7e-a9ecb962fc09.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d48a3c6c-f39c-42e9-bd7e-a9ecb962fc09.vsidx"
new file mode 100644
index 0000000..4821767
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d48a3c6c-f39c-42e9-bd7e-a9ecb962fc09.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index 72824bd..4ebf00d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -47,11 +47,12 @@
WebResponseContent GenerateOutboundTask(int[] keys);
WebResponseContent PalletOutboundTask(string roadwayNo, string endStation);
-
+ WebResponseContent Bind(string qty, string point);
WebResponseContent CallMateriel(string endPoint);
WebResponseContent MaterielCarry(string startPoint);
WebResponseContent GetTaskInfo();
object AGVTaskFeedBack(AGVTaskFeedBackModel taskFeedBackModel);
+ WebResponseContent AcrossFloorCallMat(string point);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index 15b03e3..8c780fe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -49,6 +49,61 @@
}
/// <summary>
+ /// 璐т綅缁戝畾
+ /// </summary>
+ /// <param name="qty"></param>
+ /// <param name="Point"></param>
+ /// <returns></returns>
+ public WebResponseContent Bind(string qty, string point)
+ {
+ try
+ {
+ if (Repository.QueryFirst(x => x.SourceAddress == point &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == point) != null)
+ throw new Exception($"绔欑偣銆恵point}銆戝瓨鍦ㄤ换鍔★紒");
+ Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
+ if (cachePoint == null) throw new Exception("鏈壘鍒扮紦瀛樼偣!");
+ if (cachePoint.AreaId != 4) throw new Exception("褰撳墠缂撳瓨鐐瑰尯鍩熸棤缁戝畾鏉冮檺!");
+ cachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
+ cachePoint.Remark = qty;
+ cachePoint.Modifier = App.User.UserName;
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 閲婃斁缂撳瓨鐐�
+ /// </summary>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ public WebResponseContent AcrossFloorCallMat(string point)
+ {
+ try
+ {
+ if (Repository.QueryFirst(x => x.SourceAddress == point &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == point) != null)
+ throw new Exception($"绔欑偣銆恵point}銆戝瓨鍦ㄤ换鍔★紒");
+ Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
+ if (cachePoint == null) throw new Exception("鏈壘鍒扮紦瀛樼偣!");
+ if (cachePoint.AreaId != 2 && cachePoint.AreaId != 5 && cachePoint.AreaId != 8)
+ throw new Exception("褰撳墠缂撳瓨鐐瑰尯鍩熸棤閲婃斁鏉冮檺!");
+ cachePoint.PointStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
/// 鍙枡
/// </summary>
/// <param name="endPoint"></param>
@@ -57,6 +112,11 @@
{
try
{
+ if (Repository.QueryFirst(x => x.SourceAddress == endPoint &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == endPoint) != null)
+ throw new Exception($"绔欑偣銆恵endPoint}銆戝瓨鍦ㄤ换鍔★紒");
+
Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
Dt_Task task = new Dt_Task()
@@ -78,7 +138,7 @@
Db.Ado.BeginTran();
var response = SendAGVTask(task, cachePoint);
- if (response.Status)
+ if (!response.Status)
{
_unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error($"{response.Message}");
@@ -105,6 +165,11 @@
{
try
{
+ if (Repository.QueryFirst(x => x.SourceAddress == startPoint &&
+ x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
+ x.TargetAddress == startPoint) != null)
+ throw new Exception($"绔欑偣銆恵startPoint}銆戝瓨鍦ㄤ换鍔★紒");
+
Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
Dt_Task task = new()
@@ -124,12 +189,21 @@
};
cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ Db.Ado.BeginTran();
+ var response = SendAGVTask(task, cachePoint);
+ if (!response.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"{response.Message}");
+ }
_basicService.CachePointService.Repository.UpdateData(cachePoint);
Repository.AddData(task);
+ Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ Db.Ado.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 737876f..94f327f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -11,6 +11,7 @@
using System.IO;
using WIDESEA_Model.Models;
using System;
+using System.Net;
namespace WIDESEA_WMSServer.Controllers
{
@@ -29,28 +30,62 @@
_taskService = taskService;
}
/// <summary>
+ /// 缁戝畾璐т綅
+ /// </summary>
+ /// <param name="qty"></param>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Bind"), AllowAnonymous]
+ public WebResponseContent Bind(string qty, string point)
+ {
+ return _taskService.Bind(qty, point);
+ }
+ /// <summary>
+ /// 閲婃斁缂撳瓨鐐�
+ /// </summary>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AcrossFloorCallMat"), AllowAnonymous]
+ public WebResponseContent AcrossFloorCallMat(string point)
+ {
+ return _taskService.AcrossFloorCallMat(point);
+ }
+ /// <summary>
/// 鍙枡
/// </summary>
/// <param name="endPoint"></param>
/// <returns></returns>
[HttpPost, Route("CallMateriel"), AllowAnonymous]
- public WebResponseContent CallMateriel([FromBody] string endPoint)
+ public WebResponseContent CallMateriel(string endPoint)
{
return _taskService.CallMateriel(endPoint);
}
-
+ /// <summary>
+ /// 鎼繍
+ /// </summary>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
[HttpPost, Route("MaterielCarry"), AllowAnonymous]
- public WebResponseContent MaterielCarry([FromBody] string startPoint)
+ public WebResponseContent MaterielCarry(string startPoint)
{
return _taskService.MaterielCarry(startPoint);
}
-
+ /// <summary>
+ /// 缁勭洏
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
[HttpPost, Route("MaterielGroup")]
public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
{
return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
}
-
+ /// <summary>
+ /// 鏌ヨ鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
[HttpPost, Route("QueryOrderInfo")]
public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
{
@@ -59,7 +94,7 @@
[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
public async Task<WebResponseContent> UploadApk(IEnumerable<IFormFile> fileInput)
- {
+ {
// 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶
if (fileInput == null || !fileInput.Any())
{
@@ -68,7 +103,7 @@
var formFile = fileInput.First();
var uploadFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "Upload");
- Directory.CreateDirectory(uploadFolder);
+ Directory.CreateDirectory(uploadFolder);
var fileName = $"WMS-PDA.apk";
var filePath = Path.Combine(uploadFolder, fileName);
@@ -109,7 +144,7 @@
}
memory.Position = 0;
var ext = Path.GetExtension(filePath).ToLowerInvariant();
- return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath));
+ return File(memory, new Dictionary<string, string> { { ".apk", "application/vnd.android.package-archive" } }[ext], Path.GetFileName(filePath));
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-06-08/\345\217\253\346\226\231\344\273\273\345\212\241\344\270\213\345\217\221250608.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-06-08/\345\217\253\346\226\231\344\273\273\345\212\241\344\270\213\345\217\221250608.txt"
new file mode 100644
index 0000000..a1388bc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2025-06-08/\345\217\253\346\226\231\344\273\273\345\212\241\344\270\213\345\217\221250608.txt"
@@ -0,0 +1,5 @@
+2025/6/8 20:26:51.713
+璇锋眰寮傚父
+{"璇锋眰鎶ユ枃":{"task_id":"68","task_name":null,"priority":"0","site_value_type":1,"src_pos":"ZH013M007","dst_pos":"ZH012M001","car_id":-1,"src_level":4,"dst_level":0,"task_type":"1132","former_id":null},"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."}
+-------------------------------
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/common/http.interceptor.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/common/http.interceptor.js"
index e5ce9b5..1d9e443 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/common/http.interceptor.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/common/http.interceptor.js"
@@ -1,7 +1,7 @@
// let baseUrl = 'http://10.1.105.155:9995'
// let baseUrl = 'http://10.1.211.101:9004'
-// let baseUrl = 'http://127.0.0.1:9995'
-let baseUrl = 'http://192.168.100.14:9290'
+ let baseUrl = 'http://127.0.0.1:9290'
+//let baseUrl = 'http://192.168.100.14:9290'
// let baseUrl = 'http://192.168.43.71:9995'
// let baseUrl = 'http://47.112.196.253:8881'
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/basic/cachePoint.vue"
index 50e971a..5aa487d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/basic/cachePoint.vue"
@@ -1,36 +1,36 @@
<template>
<view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-show="current === 0">
- <view style="padding: 5%;">
- <uni-forms label-width="120">
- <uni-forms-item label="缂撳瓨鐐�">
- <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="value"
- placeholder="璇疯緭鍏ョ紦瀛樼偣" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">閲婃斁</button>
- <u-toast ref="uToast" />
- </view>
- </view>
- <view v-show="current === 1">
- <view style="padding: 5%;">
- <uni-forms label-width="120">
- <uni-forms-item label="缂撳瓨鐐�">
- <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="value"
- placeholder="璇疯緭鍏ョ紦瀛樼偣" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鎷嗗寘</button>
- <u-toast ref="uToast" />
- </view>
- </view>
- <!-- <view v-show="current === 2">
+ <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
+ </uni-segmented-control>
+ <view v-show="current === 0">
+ <view style="padding: 5%;">
+ <uni-forms label-width="120">
+ <uni-forms-item label="缂撳瓨鐐�">
+ <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="value"
+ placeholder="璇疯緭鍏ョ紦瀛樼偣" ref='midInput' />
+ </uni-forms-item>
+ </uni-forms>
+ <button @click="submit" type="primary" size="default" style="margin-top: 2%;">閲婃斁</button>
+ <u-toast ref="BindluToast" />
+ </view>
+ </view>
+ <view v-show="current === 1">
+ <view style="padding: 5%;">
+ <uni-forms label-width="120">
+ <uni-forms-item label="缂撳瓨鐐�">
+ <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="value"
+ placeholder="璇疯緭鍏ョ紦瀛樼偣" ref='midInput' />
+ </uni-forms-item>
+ </uni-forms>
+ <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鎷嗗寘</button>
+ <u-toast ref="uToast" />
+ </view>
+ </view>
+ <!-- <view v-show="current === 2">
閫夐」鍗�3鐨勫唴瀹�
</view> -->
- </view>
- </view>
+ </view>
+ </view>
</template>
<script>
@@ -40,7 +40,7 @@
istrue: false,
range: [],
value: "",
- items: ['閲婃斁缂撳瓨浣�', '鎷嗗寘'],
+ items: ['閲婃斁缂撳瓨浣�'], //, '鎷嗗寘'
current: 0
}
},
@@ -49,43 +49,43 @@
},
methods: {
onClickItem(e) {
- if (this.current != e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
+ if (this.current != e.currentIndex) {
+ this.current = e.currentIndex;
+ }
+ },
submit() {
- if (this.value.length <= 0) {
- this.$refs.uToast.show({
+ if (this.value == "") {
+ this.$refs.BindluToast.show({
title: "璇疯緭鍏ョ紦瀛樼偣",
type: "error"
})
return;
}
- var param = {
- MainData: {
- matCode: this.value,
- endPoint: this.value
- }
- }
- this.$u.post('/api/AcrossFloorCarry/AcrossFloorCallMat', param).then(res => {
+ // var param = {
+ // MainData: {
+ // matCode: this.value,
+ // endPoint: this.value
+ // }
+ // }
+ this.$u.post('/api/PDA/AcrossFloorCallMat?Point=' + this.value, {}).then(res => {
if (res.status) {
- this.$refs.uToast.show({
+ this.$refs.BindluToast.show({
title: "閲婃斁鎴愬姛",
type: "success"
})
- this.carNo = "";
+ // this.carNo = "";
this.value = "";
- this.locationNo = "";
+ // this.locationNo = "";
this.istrue = false;
} else {
- this.$refs.uToast.show({
+ this.$refs.BindluToast.show({
title: res.message,
type: "error"
})
}
})
},
-
+
}
}
</script>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/task/AgvTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/task/AgvTask.vue"
index ec4b025..5cace51 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/task/AgvTask.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/ZhongHePDA/pages/task/AgvTask.vue"
@@ -5,9 +5,9 @@
<view v-show="current === 0">
<view style="padding: 5%;">
<uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏缂栫爜">
- <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="PalletCode"
- placeholder="璇疯緭鍏ユ墭鐩樼紪鐮�" ref='midInput' />
+ <uni-forms-item label="鎵樼洏鏁伴噺">
+ <uni-easyinput type="text" :focus="istrue" @input="carNoInputChange" v-model="PalletCode"
+ placeholder="璇疯緭鍏ユ墭鐩樻暟閲�" ref='midInput' />
</uni-forms-item>
<uni-forms-item label="缁戝畾璐т綅">
<uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="Point"
@@ -54,8 +54,8 @@
range: [],
EndAddress: "",
StartAddress: "",
- PalletCode:"",
- Point:"",
+ PalletCode: "",
+ Point: "",
items: ['璐т綅缁戝畾', '鍙枡', '鎼繍'],
current: 0
}
@@ -70,26 +70,27 @@
}
},
Bind() {
- if (this.PalletCode.length <= 0&&this.Point.length) {
+ if (this.PalletCode.length == "" || this.Point.length == "") {
this.$refs.BindluToast.show({
- title: "鎵樼洏缂栫爜璺熺粦瀹氳揣浣嶄笉鑳戒负绌�",
+ title: "鎵樼洏鏁伴噺璺熺粦瀹氳揣浣嶄笉鑳戒负绌�",
type: "error"
})
return;
}
- var param = {
- MainData: {
- "PalletCode": this.PalletCode,
- "Point":this.Point
- },
- }
- this.$u.post('/api/PDA/CallMateriel', param).then(res => {
+ // var param = {
+ // MainData: {
+ // "PalletCode": this.PalletCode,
+ // "Point": this.Point
+ // },
+ // }
+ this.$u.post('/api/PDA/Bind?qty=' + this.PalletCode + '&point=' + this.Point, {}).then(res => {
if (res.status) {
- this.$refs.uToast.show({
- title: "鍛煎彨Agv鎼繍鎴愬姛",
+ this.$refs.BindluToast.show({
+ title: "缁戝畾鎴愬姛",
type: "success"
})
- this.EndAddress = "";
+ this.Point = "";
+ this.PalletCode = "";
this.istrue = false;
} else {
this.$refs.BindluToast.show({
@@ -100,22 +101,22 @@
})
},
CallMateriel() {
- if (this.EndAddress.length <= 0) {
+ if (this.EndAddress == "") {
this.$refs.CallMaterieluToast.show({
title: "璇疯緭鍏ョ粓鐐�",
type: "error"
})
return;
}
- var param = {
- MainData: {
- "endPoint": this.EndAddress
- },
- }
- this.$u.post('/api/PDA/CallMateriel', param).then(res => {
+ // var param = {
+ // MainData: {
+ // "endPoint": this.EndAddress
+ // },
+ // }
+ this.$u.post('/api/PDA/CallMateriel?endPoint=' + this.EndAddress, {}).then(res => {
if (res.status) {
- this.$refs.uToast.show({
- title: "鍛煎彨Agv鎼繍鎴愬姛",
+ this.$refs.CallMaterieluToast.show({
+ title: "鍙枡鎴愬姛",
type: "success"
})
this.EndAddress = "";
@@ -129,21 +130,21 @@
})
},
MaterielCarry() {
- if (this.StartAddress.length <= 0) {
+ if (this.StartAddress == "") {
this.$refs.MaterielCarryuToast.show({
title: "璇疯緭鍏ヨ捣鐐�",
type: "error"
})
return;
}
- var param = {
- MainData: {
- "startPoint": this.StartAddress
- },
- }
- this.$u.post('/api/PDA/MaterielCarry', param).then(res => {
+ // var param = {
+ // MainData: {
+ // "startPoint": this.StartAddress
+ // },
+ // }
+ this.$u.post('/api/PDA/MaterielCarry?startPoint=' + this.StartAddress, {}).then(res => {
if (res.status) {
- this.$refs.uToast.show({
+ this.$refs.MaterielCarryuToast.show({
title: "鍛煎彨Agv鎼繍鎴愬姛",
type: "success"
})
--
Gitblit v1.9.3