From e01f8369e106e235a4454f56c428156bf12d9d99 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 14:38:00 +0800
Subject: [PATCH] add

---
 CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/DataProcess_BZ21.cs |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 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 9f681ac..4d19cd1 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"
@@ -62,16 +62,13 @@
                                 continue;
                             }
                             var upiCode = result.Replace("/r", ""); ;
-                            short cartonwidth = 0;//鏄惁鏈澘
-                            short cartonhigh = 0;//鏄惁鏃嬭浆
-                            short placeX = 0;
-                            short placeY = 0;
-                            short placeZ = 0;
-                            string place = "";
+                            short cartonwidth = 0;//绾哥瀹�
+                            short cartonhigh = 0;//绾哥楂�
+                            string place = "22";
                             using (WmsDBModel wmsDB = new WmsDBModel())
                             {
                                 //瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
-                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB,result);
+                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB, result);
                                 if (!isValidate)
                                 {
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
@@ -83,25 +80,35 @@
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
                                     continue;
                                 }
-                                placeX = (short)upiObj.MachineXCenter;
-                                placeY = (short)upiObj.MachineYCenter;
-                                placeZ = (short)upiObj.MachineZCenter;
-                                cartonhigh = (short)upiObj.Info1;
-                                cartonwidth = (short)upiObj.Info2;
+                                var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
+                                if (mesgather != null)
+                                {
+                                    mesgather.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
+                                    mesgather.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
+                                }
 
+                                cartonhigh = (short)upiObj.Info3;
+                                cartonwidth = (short)upiObj.Info2;
+                                upiObj.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
+                                upiObj.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
                                 //璁板綍浠诲姟
                                 var _id = Yitter.IdGenerator.YitIdHelper.NextId();
+                                var putpakegecodeid = Yitter.IdGenerator.YitIdHelper.NextId();
                                 var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
+                                var mesinequeue = ClassHelper.RotationMapping<mes_package_linequeue, mes_batchOrderUPI_new>(upiObj);
+                                mesinequeue.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                 var putpakegecode = new mes_push_packagecode()
                                 {
-                                    Id = _id,
-                                    PackageCode=upiObj.PackageCode,
-                                    PushStatus=0,
-                                    PushNum=0,
+                                    Id = putpakegecodeid,
+                                    PackageCode = upiObj.PackageCode,
+                                    PushStatus = 0,
+                                    PushNum = 0,
+                                    ApiMessage = "11",
                                     CreateTime = DateTime.Now,
                                     CreateUserName = "CC",
                                     UpdateTime = DateTime.Now,
                                     UpdateUserName = "CC",
+                                    CreateOrgName = "11"
                                 };
                                 var task = new wms_rbline_task()
                                 {
@@ -116,24 +123,24 @@
                                     OrderId = upiObj.OrderId,
                                     PackageCode = upiObj.PackageCode,
                                     RbTaskType = (int)RbTaskTypeEnum.澶规澘浠诲姟,
-                                    RbTaskTypeEnumName = RbTaskTypeEnum.鐮佹澘浠诲姟.ToString(),
+                                    RbTaskTypeEnumName = RbTaskTypeEnum.澶规澘浠诲姟.ToString(),
                                     TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�,
                                     TaskStatusName = TaskStatusEnum.宸蹭笅鍙�.ToString(),
-                                    TaskMsg = "鐮佹澘",
+                                    TaskMsg = "澶规澘",
                                     CreateTime = DateTime.Now,
                                     CreateUserName = "CC",
                                     UpdateTime = DateTime.Now,
                                     UpdateUserName = "CC",
                                     PlaceCode = place
                                 };
-
+                                wmsDB.mes_package_linequeue.Add(mesinequeue);
                                 wmsDB.wms_rbline_task.Add(task);
                                 wmsDB.mes_push_packagecode.Add(putpakegecode);
                                 using (StationServiceClient client = new StationServiceClient())
                                 {
 
-                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, Convert.ToInt32(task.TaskNo), 
-                                          (short)upiObj.Info1, (short)upiObj.Info2,cartonhigh,cartonwidth,placeX,placeY);
+                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
+                                          (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
                                     if (!res.result)
                                     {
                                         SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";

--
Gitblit v1.9.3