From c2d6e0a51f9e47e04a7a24a06141e4414d0ea418 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 13 12月 2024 13:03:40 +0800 Subject: [PATCH] 222 --- CC/iWareCC_ASRS/FormCC.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs index 8141c09..0960ab9 100644 --- a/CC/iWareCC_ASRS/FormCC.cs +++ b/CC/iWareCC_ASRS/FormCC.cs @@ -612,17 +612,18 @@ { while (true) { - Thread.Sleep(1000);//1绉掗挓璇诲彇涓�娆� + Thread.Sleep(2000);//1绉掗挓璇诲彇涓�娆� try { if (stationServiceClient == null) { continue; } + /* iWareCC.StationService.DeviceWarningInfo[] waringList = await stationServiceClient.GetWaringInfoListAsync((int)EDevice.Station, configDeviceWarningList.wmsConfigDeviceWarnings.ToArray()); //鏄剧ず鎶ヨ淇℃伅 - List<String> warningAddressList = new List<string>(); + List<String> warningCodeList = new List<string>(); if (waringList != null && waringList.Length > 0) { for (int i = 0; i < waringList.Length; i++) @@ -630,7 +631,7 @@ var findObj = configDeviceWarningList.wms_config_device_warning_list.Where(x => x.WarningCode == waringList[i].Codek__BackingField).FirstOrDefault(); DeviceWarningHandler.SaveWarning(EDevice.Station, iWareCommon.Utils.LogType.StationThreadService, findObj.WarningCode, findObj.DeviceAreaCode, findObj.WarningContent, findObj.DeviceWarningType);//鏂板鎶ヨ - warningAddressList.Add(findObj.WarningCode); + warningCodeList.Add(findObj.WarningCode); } } @@ -638,7 +639,7 @@ { } - DeviceWarningHandler.AutoCloseWarning(EDevice.Station, iWareCommon.Utils.LogType.StationThreadService, warningAddressList);//鑷姩鍏抽棴鎶ヨ + DeviceWarningHandler.AutoCloseWarning(EDevice.Station, iWareCommon.Utils.LogType.StationThreadService, warningCodeList);//鑷姩鍏抽棴鎶ヨ //*/ } @@ -1476,6 +1477,49 @@ item.UpiStatus = (int)UpiStatusEnum.鍒濆; } + //娓呯┖闃熷垪鏁版嵁 + var list = db.mes_upi_linequeue.ToList(); + db.mes_upi_linequeue.RemoveRange(list); + + db.SaveChanges(); + } + if (!string.IsNullOrEmpty(alertMsg)) + { + MessageBox.Show("閿欒:" + alertMsg); + } + else + { + MessageBox.Show("宸插鐞�"); + } + } + + private void button1_Click(object sender, EventArgs e) + { + + + var alertMsg = ""; + using (WmsDBModel db = new WmsDBModel()) + { + //鏌ヨ绔嬩綋搴撲腑鐨剈pi鍒楄〃 + var quanList = db.wms_stock_quan.ToList().Select(x => x.Upi).ToList(); + var upiList = db.mes_batchOrderUPI_new.Where(x => !quanList.Contains(x.UPI)).ToList(); + foreach (var item in upiList) + { + item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�; + item.UpiStatus = (int)UpiStatusEnum.鍒濆; + } + + var packageCodeList = upiList.Select(x => x.PackageCode).ToList(); + var pList = db.mes_package_gather.Where(x => packageCodeList.Contains(x.PackageCode)).ToList(); + foreach (var item in pList) + { + item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�; + item.UpiStatus = (int)UpiStatusEnum.鍒濆; + } + //娓呯┖闃熷垪鏁版嵁 + var list = db.mes_upi_linequeue.ToList(); + db.mes_upi_linequeue.RemoveRange(list); + db.SaveChanges(); } if (!string.IsNullOrEmpty(alertMsg)) -- Gitblit v1.9.3