From d50dd441d7032f58164e2a4b21ea53ba2c3967ef Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 25 六月 2024 11:49:26 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 5cf982d..f6e21d9 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -35,7 +35,7 @@
{
var house = "W01";//鍙《浣嶇疆锛屽悗缁牴鎹綅缃叧鑱旀垨瀹氫箟锛屾潵鍒ゆ柇鍙《浣嶇疆鎵�灞炶溅闂�
var url = "";//鍥炰紶MES鐨勬帴鍙ｅ湴鍧�
- var noticeno = "";//鍑哄叆搴撳崟鎹槑缁咺D
+ var noticeno = "0";//鍑哄叆搴撳崟鎹槑缁咺D
var sql = "select PalletNo,LocatNo from DataStockDetail where Status = '0'";
switch (pallnetmsg.Type)
{
@@ -82,6 +82,18 @@
CreateLotTask(ztask);
return;
}
+ //涓嬪彂灏忚溅浠诲姟
+ var task2 = new TaskDetial
+ {
+ Startport = item.LocatNo,
+ Endport = pallnetmsg.Location,
+ Pallno = item.PalletNo,
+ Type = pallnetmsg.Type,
+ Crtype = "1",
+ Noticedetailno = int.Parse(noticeno),
+ };
+ CreateLotTask(task2);
+ return;
}
else
{
@@ -152,8 +164,8 @@
//涓嬪彂灏忚溅浠诲姟
var task = new TaskDetial
{
- Startport = pallnetmsg.Location,
- Endport = pallet.LocatNo,
+ Startport = pallet.LocatNo,
+ Endport = pallnetmsg.Location,
Pallno = pallet.PackagNo,
Type = pallnetmsg.Type,
Crtype = "1",
@@ -358,34 +370,42 @@
var na = taskDetial.Crtype == "0"?"鍏ュ簱":"鍑哄簱";
var sql = "";
var sql2 = "";
+ var ordertype = "3";
+ if (taskDetial.Type == "2" && taskDetial.Crtype =="1")
+ {
+ ordertype = "1";
+ }
+ else if(taskDetial.Type =="2" && taskDetial.Crtype == "0")
+ {
+ ordertype = "0";
+ }
//寮�鍚簨鍔�
Db.BeginTran();
//鍒ゆ柇浠诲姟鏄惁涓烘柊浠诲姟
if (string.IsNullOrWhiteSpace(taskDetial.Taskno))
{
taskDetial.Taskno = new Common().GetMaxNo("T");
-
- var logTaskEntry = new LogTask
- {
- TaskNo = taskDetial.Taskno,
- Sender = "WMS",
- Receiver = "RCS",
- //IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- SendDate = DateTime.Now, //鍙戦�佹椂闂�
- //BackDate = DateTime.Now, //杩斿洖鏃堕棿
- StartLocat = taskDetial.Startport,//璧峰浣嶇疆
- EndLocat = taskDetial.Endport,//鐩爣浣嶇疆
- PalletNo = taskDetial.Pallno,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = taskDetial.Crtype,//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- NoticeDetailNo = int.Parse(taskDetial.Noticedetailno.ToString()),
- Msg = $"{taskDetial.Endport}鐨剓na}浠诲姟", //鍏抽敭淇℃伅
- };
- Db.Insertable(logTaskEntry).ExecuteCommand();
}
+ var logTaskEntry = new LogTask
+ {
+ TaskNo = taskDetial.Taskno,
+ Sender = "WMS",
+ Receiver = "RCS",
+ //IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ //BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartLocat = taskDetial.Startport,//璧峰浣嶇疆
+ EndLocat = taskDetial.Endport,//鐩爣浣嶇疆
+ PalletNo = taskDetial.Pallno,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = taskDetial.Crtype,//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ OrderType = ordertype,//鍗曟嵁绫诲瀷 0 鍏ュ簱 1 鍑哄簱 3鍏朵粬
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ NoticeDetailNo = int.Parse(taskDetial.Noticedetailno.ToString()),
+ Msg = $"{taskDetial.Endport}鐨剓na}浠诲姟", //鍏抽敭淇℃伅
+ };
var Agv = new AgvTask
{
taskCode = taskDetial.Taskno,
@@ -398,13 +418,14 @@
genAgvSchedulingTaskRep chrep =genAgvSchedulingTask(Agv, "url");
if (chrep.code != "0")
{
- sql = $"UPDATE LogTask SET IsSuccess = '0' WHERE TaskNo = {taskDetial.Taskno}";
- Db.Ado.ExecuteCommand(sql);
+ logTaskEntry.IsSuccess = 0;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
Db.CommitTran();
- throw new Exception("RCS浠诲姟涓嬪彂閿欒锛孯CS杩斿洖娑堟伅锛�"+chrep.message);
+ throw new Exception("RCS浠诲姟涓嬪彂閿欒锛孯CS杩斿洖娑堟伅锛�" + chrep.message);
}
- sql = $"UPDATE LogTask SET IsSuccess = 1,BackDate = {DateTime.Now},Status = '1' WHERE TaskNo = {taskDetial.Taskno}";
- Db.Ado.ExecuteCommand(sql);
+ logTaskEntry.IsSuccess = 1;
+ logTaskEntry.BackDate = DateTime.Now;
+ logTaskEntry.Status = "1";
if (taskDetial.Crtype == "0")
{
sql = $"UPDATE SysStorageLocat SET Status = '2' where LocatNo = '{taskDetial.Endport}'";
@@ -415,6 +436,7 @@
{
sql = $"UPDATE SysStorageLocat SET Status = '3' where LocatNo = '{taskDetial.Startport}' ";
}
+ Db.Insertable(logTaskEntry).ExecuteCommand();
Db.Ado.ExecuteCommand(sql);
//鎻愪氦浜嬪姟
Db.CommitTran();
--
Gitblit v1.8.0