From 60a4de55deb1aeeb5621028a8f8c732c38027f81 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:19:35 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 174 +++++++--------------------------------------------------
1 files changed, 23 insertions(+), 151 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
similarity index 62%
rename from "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
rename to "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index b48aa38..e82dbab 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -4,6 +4,8 @@
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
using iWareModel;
+using iWareModel.Entity.MES;
+using iWareModel.EnumType.WMS;
using iWareSql.DataAccess;
using iWareSql.WmsDBModel;
using Newtonsoft.Json.Linq;
@@ -65,8 +67,8 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
- short cartonwidth = 0;//绾哥瀹�
- short cartonhigh = 0;//绾哥楂�
+ //short cartonwidth = 0;//绾哥瀹�
+ //short cartonhigh = 0;//绾哥楂�
string place = "22";
using (WmsDBModel wmsDB = new WmsDBModel())
{
@@ -85,62 +87,14 @@
}
//string upi = "LS070700101B0001GS";
//璋冪敤鍑虹焊鏈烘帴鍙�
- var res = new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode=" + upiObj.PackageCode, Guid.NewGuid(), 10000);
- if (res.iState == 0)
- {
- /*
- var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
- if (papertable != null)
- {
- papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
- papertable.ApiMessage = res.message;
- papertable.PushNum++;
- }
- else
- {
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- //*/
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- else
- {
- /*
- var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
- if (papertable != null)
- {
- papertable.PushStatus = (int)PushStatusEnum.PushFail;
- papertable.ApiMessage = res.message;
- papertable.PushNum++;
- }
- else
- {
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushFail;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- //*/
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushFail;
- wmsDB.mes_push_papercut.Add(papercut);
- continue;
- }
+ var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
+ papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ papercut.ApiMessage = "";
+ papercut.PushNum = 1;
+ papercut.PushStatus = (int)PushStatusEnum.NotPush;
+ papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
+ wmsDB.mes_push_papercut.Add(papercut);
+
//鏇存柊琛�
var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
if (mesgather != null)
@@ -148,11 +102,11 @@
mesgather.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
mesgather.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
}
- var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
- var upilength = upilist.Max(x => x.Length);
- var upiwidth = upilist.Max(x => x.Width);
- cartonhigh = (short)upiObj.Info3;
- cartonwidth = (short)upiObj.Info2;
+ //var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
+ //var upilength = upilist.Max(x => x.Length);
+ //var upiwidth = upilist.Max(x => x.Width);
+ //cartonhigh = (short)upiObj.Info3;
+ //cartonwidth = (short)upiObj.Info2;
upiObj.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
upiObj.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
//璁板綍浠诲姟
@@ -189,10 +143,10 @@
PlanNo = upiObj.PlanNo,
OrderId = upiObj.OrderId,
PackageCode = upiObj.PackageCode,
- RbTaskType = (int)RbTaskTypeEnum.澶规澘浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.澶规澘浠诲姟.ToString(),
- TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�,
- TaskStatusName = TaskStatusEnum.宸蹭笅鍙�.ToString(),
+ RbTaskType = (int)RbTaskTypeEnum.鍚堝寘浠诲姟,
+ RbTaskTypeEnumName = RbTaskTypeEnum.鍚堝寘浠诲姟.ToString(),
+ TaskStatus = (int)TaskStatusEnum.鏂板缓,
+ TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
TaskMsg = "澶规澘",
CreateTime = DateTime.Now,
CreateUserName = "CC",
@@ -237,6 +191,7 @@
continue;
}
+ /*
using (StationServiceClient client = new StationServiceClient())
{
@@ -252,6 +207,7 @@
Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,WriteInStoreTaskInfoAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
}
+ //*/
WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
@@ -269,91 +225,7 @@
}
}
}
- /// <summary>
- /// 鍚憁es鎺ㄩ�佸寘瑁呭畬鎴�
- /// </summary>
- public static void PushPackageCode()
- {
- while (true)
- {
- Thread.Sleep(2000);
- using (WmsDBModel edm = new WmsDBModel())
- {
- var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
- if (value != null)
- {
- PushPackageCodeInput input = new PushPackageCodeInput();
- input.PackageCode = value.PackageCode;
- var res = HttpHelper.GetHttpResponse<PushPackageCodeInput, Respone>(" ", input, 10000);
- if (res.iState == 0)
- {
- value.PushStatus = (int)PushStatusEnum.PushSuccess;
- value.ApiMessage = res.message;
- }
- else
- {
- value.PushStatus = (int)PushStatusEnum.Pushing;
- value.PushNum++;
- value.ApiMessage += res.message;
- if (value.PushNum == 3)
- {
- value.PushStatus = (int)PushStatusEnum.PushFail;
- }
- }
- edm.SaveChanges();
- }
- }
- }
- }
- public class PushPackageCodeInput
- {
- public string PackageCode { get; set; }
- }
- public class Respone
- {
- /// <summary>
- /// 杩斿洖鐮�
- /// </summary>
- public int iState { get; set; }
- /// <summary>
- /// 杩斿洖娑堟伅
- /// </summary>
- public string message { get; set; }
- /// <summary>
- /// 鑷畾涔夎繑鍥�
- /// </summary>
- public string data { get; set; }
- }
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public enum PushStatusEnum
- {
- /// <summary>
- /// 鏈帹閫�
- /// </summary>
- [Description("鏈帹閫�")]
- NotPush = 0,
-
- /// <summary>
- /// 鎺ㄩ�佷腑
- /// </summary>
- [Description("鎺ㄩ�佷腑")]
- Pushing = 1,
-
- /// <summary>
- /// 鎺ㄩ�佹垚鍔�
- /// </summary>
- [Description("鎺ㄩ�佹垚鍔�")]
- PushSuccess = 2,
-
- /// <summary>
- /// 鎺ㄩ�佸け璐�
- /// </summary>
- [Description("鎺ㄩ�佸け璐�")]
- PushFail = 3,
- }
}
}
--
Gitblit v1.9.3