From 17e8b649951cd9dbfa7ad77173f5830a678de313 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:26:24 +0800
Subject: [PATCH] add

---
 CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/DataProcess_BZ21.cs |   88 ++++++++++++++++++++++---------------------
 1 files changed, 45 insertions(+), 43 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 6543fb2..5778a5c 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"
@@ -1,4 +1,5 @@
 锘縰sing Admin.NET.Application;
+using iWareCC.Common.Helper;
 using iWareCC.StationService;
 using iWareCommon.Common.Globle;
 using iWareCommon.Utils;
@@ -82,48 +83,48 @@
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁UPI:{result}娌℃湁鎵惧埌瀵硅薄 ";
                                     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;
-                                }
+                                //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 mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
                                 if (mesgather != null)
@@ -191,6 +192,7 @@
                                 print.PrintNum= 0;
                                 print.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
                                 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();
@@ -203,7 +205,7 @@
                                 //澶勭悊琛�  mes_order_gather
                                 var errmsg = "";
                                 var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
-                                var resultAlert = DataProcess_ValidateQiTao.HandlerOrderGather(wmsDB, package, "", "", out errmsg);
+                                var resultAlert = MyExtendHelper.HandlerOrderGather(wmsDB, package, "", "", out errmsg);
                                 if (resultAlert == false)
                                 {
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ21 = errmsg;

--
Gitblit v1.9.3