From c6dad51bdd23cf8425a2e6bb47b9b9412a0dabbe Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 29 11月 2024 15:53:06 +0800
Subject: [PATCH] add

---
 CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/DataProcess_BZ21.cs |  105 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 92 insertions(+), 13 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 4d19cd1..20fa695 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"
@@ -5,8 +5,10 @@
 using iWareModel;
 using iWareSql.DataAccess;
 using iWareSql.WmsDBModel;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -28,6 +30,7 @@
                 {
                     if (SystemValue.isStartedModel)
                     {
+                        
                         var rgvLocation = StationLocationEnum.BZ21.ToString();
                         /*
                          * 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
@@ -80,6 +83,22 @@
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
                                     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 papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
+                                    papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+                                    papercut.ApiMessage = res.message;
+                                    papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
+                                    wmsDB.mes_push_papercut.Add(papercut);
+                                }
+                                else
+                                {
+
+                                    continue;
+                                }
+                                //鏇存柊琛�
                                 var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
                                 if (mesgather != null)
                                 {
@@ -95,21 +114,24 @@
                                 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();
+                                //鏂板mes鎺ㄩ�佽〃
                                 var putpakegecode = new mes_push_packagecode()
                                 {
                                     Id = putpakegecodeid,
                                     PackageCode = upiObj.PackageCode,
                                     PushStatus = 0,
                                     PushNum = 0,
-                                    ApiMessage = "11",
+                                    ApiMessage = "寰呮帹閫�",
                                     CreateTime = DateTime.Now,
                                     CreateUserName = "CC",
                                     UpdateTime = DateTime.Now,
                                     UpdateUserName = "CC",
                                     CreateOrgName = "11"
                                 };
+                                //鏂板浠诲姟琛�
                                 var task = new wms_rbline_task()
                                 {
                                     Id = _id,
@@ -133,17 +155,32 @@
                                     UpdateUserName = "CC",
                                     PlaceCode = place
                                 };
+                                //鏂板鎵撳嵃琛�
+                                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.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
+                                print.IsAllowPrint= true;
+                                wmsDB.wms_record_print.Add(print);
+                                wms_record_print printtwo = print;
+                                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);
                                 using (StationServiceClient client = new StationServiceClient())
                                 {
 
-                                    var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
+                                    var plcres = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
                                           (short)upiObj.Length, (short)upiObj.Width, cartonhigh, cartonwidth, 0, 0);
-                                    if (!res.result)
+                                    if (!plcres.result)
                                     {
-                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
+                                        SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{plcres.resMsg}";
                                         continue;
                                     }
                                     else
@@ -164,6 +201,9 @@
                 }
             }
         }
+        /// <summary>
+        /// 鍚憁es鎺ㄩ�佸寘瑁呭畬鎴�
+        /// </summary>
         public static void PushPackageCode()
         {
             while (true)
@@ -177,7 +217,22 @@
                         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();
                     }
                 }
             }
@@ -191,7 +246,7 @@
             /// <summary>
             /// 杩斿洖鐮�
             /// </summary>
-            public string code { get; set; }
+            public int iState { get; set; }
 
             /// <summary>
             /// 杩斿洖娑堟伅
@@ -199,14 +254,38 @@
             public string message { get; set; }
 
             /// <summary>
-            /// 璇锋眰缂栧彿
-            /// </summary>
-            public string reqCode { 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