From e8734db76fbbb3149ba663beff3b4f7451012b03 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 13:28:34 +0800
Subject: [PATCH] 11
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 51 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/DataProcess_BZ21.cs"
index 5778a5c..b48aa38 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/DataProcess_BZ21.cs"
@@ -31,7 +31,7 @@
{
if (SystemValue.isStartedModel)
{
-
+
var rgvLocation = StationLocationEnum.BZ21.ToString();
/*
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
@@ -84,47 +84,63 @@
continue;
}
//string upi = "LS070700101B0001GS";
- ////璋冪敤鍑虹焊鏈烘帴鍙�
- //var res =new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode="+upi, 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 = 0;
- // 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 = 0;
- // papercut.PushStatus = (int)PushStatusEnum.PushFail;
- // wmsDB.mes_push_papercut.Add(papercut);
- // }
- // continue;
- //}
+ //璋冪敤鍑虹焊鏈烘帴鍙�
+ 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 mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
if (mesgather != null)
@@ -132,7 +148,9 @@
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;
upiObj.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
@@ -183,23 +201,30 @@
PlaceCode = place
};
//鏂板鎵撳嵃琛�
- var printid= Yitter.IdGenerator.YitIdHelper.NextId();
+ var printid = Yitter.IdGenerator.YitIdHelper.NextId();
var print = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
print.Id = printid;
print.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
print.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
print.PrintSheetNum = 1;
- print.PrintNum= 0;
+ print.PrintNum = 0;
print.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
- print.IsAllowPrint= true;
+ print.IsAllowPrint = true;
print.CreateTime = print.UpdateTime = DateTime.Now;
wmsDB.wms_record_print.Add(print);
- wms_record_print printtwo = print;
- printtwo.Id= Yitter.IdGenerator.YitIdHelper.NextId();
+ var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
+ printtwo.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
+ printtwo.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
+ printtwo.PrintSheetNum = 1;
+ printtwo.PrintNum = 0;
+ printtwo.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
+ printtwo.IsAllowPrint = true;
+ printtwo.CreateTime = print.UpdateTime = DateTime.Now;
+ printtwo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wmsDB.wms_record_print.Add(printtwo);
wmsDB.mes_package_linequeue.Add(mesinequeue);
- wmsDB.wms_rbline_task.Add(task);
+ wmsDB.wms_rbline_task.Add(task);
wmsDB.mes_push_packagecode.Add(putpakegecode);
//澶勭悊琛� mes_order_gather
@@ -216,7 +241,7 @@
{
var plcres = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
- (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
+ (short)upilength, (short)upiwidth, cartonhigh, cartonwidth, 0, 0);
if (!plcres.result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{plcres.resMsg}";
@@ -227,6 +252,10 @@
Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,WriteInStoreTaskInfoAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
}
+
+
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
wmsDB.SaveChanges();
}
@@ -265,7 +294,7 @@
{
value.PushStatus = (int)PushStatusEnum.Pushing;
value.PushNum++;
- value.ApiMessage+= res.message;
+ value.ApiMessage += res.message;
if (value.PushNum == 3)
{
value.PushStatus = (int)PushStatusEnum.PushFail;
--
Gitblit v1.9.3