From c0e20b1b0f1298cdc0af0037d60e74d51e364501 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 17 9月 2025 14:38:06 +0800
Subject: [PATCH] //去掉这个删除验证  【Editby shaocx,2025-09-17】

---
 CC/iWareCC_ASRS/FormCC.cs |  590 +++++++++++++++++++++++++---------------------------------
 1 files changed, 258 insertions(+), 332 deletions(-)

diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index c26f950..1868a4b 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -20,21 +20,34 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Entity.Core.Metadata.Edm;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Net;
 using System.ServiceModel;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using XiGang.Core.Model;
 using XiGang.Core.Model.ViewModels;
+using static WZ.Useful.Commons.NativeMethods;
 
 
 namespace iWareCC
 {
     public partial class FormCC : Form
     {
+        /// <summary>
+        /// 鍏ㄥ眬-269浣嶇疆鏈�鏂版壂鎻忕殑鏉夸欢鏁版嵁锛堟牸寮� 鍖呭彿|Upi|鏃堕棿鐐癸級
+        /// </summary>
+        public static string Globle_269_LastPackageUpi = "";
+
+        /// <summary>
+        /// 鍏ㄥ眬-閰嶇疆鎶ヨ淇℃伅鍒楄〃
+        /// </summary>
+        public static DeviceWarningOutput configDeviceWarningList = DeviceWarningHandler.GetConfigWarningList();
 
         /// <summary>
         /// 鍏ㄥ眬鈥旀槸鍚﹀彲浠ヨ繍琛屾墽琛屽嚭搴撴ā寮�
@@ -172,31 +185,12 @@
             startModelTipsThread.Start();
 
             #region 鑾峰彇璁惧鏁版嵁
-            ParameterizedThreadStart parStart1 = new ParameterizedThreadStart(GetSrmInfo);
-            Thread thread1 = new Thread(parStart1);
-            object o1 = (int)EDevice.涓�鍙峰爢鍨涙満;
-            thread1.Start(o1);
-
-            ParameterizedThreadStart parStart2 = new ParameterizedThreadStart(GetSrmInfo);
-            Thread thread2 = new Thread(parStart2);
-            object o2 = (int)EDevice.浜屽彿鍫嗗灈鏈�;
-            thread2.Start(o2);
-
-            ParameterizedThreadStart parStart3 = new ParameterizedThreadStart(GetSrmInfo);
-            Thread thread3 = new Thread(parStart3);
-            object o3 = (int)EDevice.涓夊彿鍫嗗灈鏈�;
-            thread3.Start(o3);
-
-            ParameterizedThreadStart parStart4 = new ParameterizedThreadStart(GetSrmInfo);
-            Thread thread4 = new Thread(parStart4);
-            object o4 = (int)EDevice.鍥涘彿鍫嗗灈鏈�;
-            thread4.Start(o4);
-
-
-
 
             var tskGetStationInfo = new Thread(GetStationInfo);
             tskGetStationInfo.Start();
+
+            var _GetStationWarningInfo = new Thread(GetStationWarningInfo);
+            _GetStationWarningInfo.Start();
 
 
             tskSetSrmLable = new Thread(SrmRead_Label);
@@ -220,12 +214,13 @@
 
 
 
-            new Thread(DataProcess_RobotBuffer_ModeChange.Handler).Start();
+            //new Thread(DataProcess_RobotBuffer_ModeChange.Handler).Start();
 
             new Thread(DataProcess_RobotBuffer_IssueOutboundTask.Handler).Start();
 
 
-            new Thread(DataProcess_RobotBuffer_AutoQiTaoOutbound.Handler).Start();
+            //new Thread(DataProcess_RobotBuffer_AutoQiTaoOutbound.Handler).Start();
+            new Thread(DataProcess_RobotBuffer_PesonOutbound.Handler).Start();
 
             new Thread(DataProcess_RobotBuffer_FinishTaskForOutbound.Handler).Start();
 
@@ -256,7 +251,7 @@
             new Thread(PushPackageCodeToMes.Handler).Start();
             new Thread(PushPaperCutToMes.Handler).Start();
 
-            new Thread(DataProcess_ValidateQiTao.Handler).Start();
+            //new Thread(DataProcess_ValidateQiTao.Handler).Start();
 
             //*/
             #endregion
@@ -270,8 +265,7 @@
         }
         private void FormCC_Load(object sender, EventArgs e)
         {
-            dateTimePicker_Start.Value = DateTime.Now;
-            dateTimePicker_End.Value = DateTime.Now;
+
 
 
             /*
@@ -286,22 +280,25 @@
 
 
             #region 瀵瑰鍙戝竷WCF褰㈠紡鏁版嵁璁块棶鏈嶅姟
-            try
+            Task.Run(() =>
             {
-                #region 瀵瑰鍙戝竷WCF褰㈠紡鏁版嵁璁块棶鏈嶅姟
-                var lineServiceHost = new ServiceHost(typeof(CCWcfService));
-                lineServiceHost.Open();
-                lbl_WCFMsg.Text = "鍙戝竷WCF鎴愬姛," + lineServiceHost.BaseAddresses[0].AbsoluteUri;
-                lbl_WCFMsg.ForeColor = Color.Green;
-                #endregion
+                try
+                {
+                    #region 瀵瑰鍙戝竷WCF褰㈠紡鏁版嵁璁块棶鏈嶅姟
+                    var lineServiceHost = new ServiceHost(typeof(CCWcfService));
+                    lineServiceHost.Open();
+                    lbl_WCFMsg.Text = "鍙戝竷WCF鎴愬姛," + lineServiceHost.BaseAddresses[0].AbsoluteUri;
+                    lbl_WCFMsg.ForeColor = Color.Green;
+                    #endregion
 
-            }
-            catch (Exception ex)
-            {
-                Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.CCWCFService, "鍙戝竷WCF澶辫触", ex);
-                lbl_WCFMsg.Text = "鍙戝竷WCF澶辫触锛�" + ex.Message;
-                lbl_WCFMsg.ForeColor = Color.Red;
-            }
+                }
+                catch (Exception ex)
+                {
+                    Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.CCWCFService, "鍙戝竷WCF澶辫触", ex);
+                    lbl_WCFMsg.Text = "鍙戝竷WCF澶辫触锛�" + ex.Message;
+                    lbl_WCFMsg.ForeColor = Color.Red;
+                }
+            });
 
             #endregion
 
@@ -391,84 +388,6 @@
 
 
 
-        /// <summary>
-        /// 鑾峰彇鍫嗗灈鏈虹殑瀹炴椂淇℃伅
-        /// </summary>
-        private void GetSrmInfo(object int_device)
-        {
-            while (true)
-            {
-                EDevice device = (EDevice)Enum.Parse(typeof(EDevice), int_device.ToString());
-                Thread.Sleep(cycleDelay_Device);
-                try
-                {
-                    using (var opcClinet = new SrmService.SrmServiceClient())
-                    {
-                        srmViewDict[(int)device] = opcClinet.GetSrmInfo((int)device);
-                        CastToDevice_SrmRealTime(srmViewDict[(int)device]);
-                        List<String> warningAddressList = new List<string>();
-                        if (srmViewDict[(int)device].R_WarningDBList != null && srmViewDict[(int)device].R_WarningDBList.Length > 0)
-                        {
-                            var waringList = srmViewDict[(int)device].R_WarningDBList.ToList();
-                            if (waringList != null && waringList.Count > 0)
-                            {
-                                for (int i = 0; i < waringList.Count; i++)
-                                {
-                                    DeviceWarningHandler.SaveWarning(device, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask,
-                                        waringList[i].Code, waringList[i].Address, waringList[i].Context);//鏂板鎶ヨ
-                                    warningAddressList.Add(waringList[i].Address);
-                                }
-                            }
-                        }
-                        DeviceWarningHandler.AutoCloseWarning(device, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, warningAddressList);//鑷姩鍏抽棴鎶ヨ
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "鑾峰彇" + device.ToString() + "鐨勫疄鏃朵俊鎭紓甯�:" + ex.Message, ex);
-                    continue;
-                }
-            };
-        }
-
-        /// <summary>
-        /// 杞崲涓篠RM鐨勫疄鏃剁姸鎬�
-        /// </summary>
-        /// <param name="view"></param>
-        private void CastToDevice_SrmRealTime(SrmView view)
-        {
-            List<Device_SrmRealTime> realTimeList = new List<Device_SrmRealTime>();
-            Device_SrmRealTime obj = new Device_SrmRealTime();
-            EDevice device = (EDevice)Enum.Parse(typeof(EDevice), view.R_SrmNo.ToString());
-            obj = new Device_SrmRealTime()
-            {
-                SrmCode = view.R_SrmNo.ToString(),
-                SrmName = device.ToString(),
-                Mode = view.R_Mode.ToString(),
-                ModeName = view.ModeName,
-                State = view.R_State.ToString(),
-                StateName = view.StateName,
-
-                TaskID = view.R_TaskNo.ToString(),
-                LiftFull = view.R_LiftFull == 1,
-                PosX = view.R_PosX,
-                PosY = view.R_PosY,
-                PosZ = view.R_PosZ,
-                PosZName = EnumberHelper.GetEnumName<ESrmForkPosition>(view.R_PosZ).ToString(),
-                // XCoordinate=view.r_xc
-
-                SrmToPlace = view.SrmToPlace,
-                SrmSourcePlace = view.SrmSourcePlace,
-                ZCoordinate = view.R_PosZmm.ToString(),
-                XCoordinate = view.R_PosXmm.ToString(),
-                YCoordinate = view.R_PosYmm.ToString()
-
-            };
-            realTimeList.Add(obj);
-
-            DeviceSrmRealTimeHandler.Update(realTimeList, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask);
-
-        }
 
 
 
@@ -603,19 +522,19 @@
 
                     this.lbl_Mode_FJ.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_FJ);
                     this.lbl_XinTiao_FJ.Text = "蹇冭烦:" + stationView.R_HandShake_FJ;
-                    this.lbl_Warning_FJ.Text = "蹇冭烦:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FJ);
+                    this.lbl_Warning_FJ.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FJ);
 
                     this.lbl_Mode_MB.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_MB);
                     this.lbl_XinTiao_MB.Text = "蹇冭烦:" + stationView.R_HandShake_MB;
-                    this.lbl_Warning_MB.Text = "蹇冭烦:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_MB);
+                    this.lbl_Warning_MB.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_MB);
 
                     this.lbl_Mode_HB.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_HB);
                     this.lbl_XinTiao_HB.Text = "蹇冭烦:" + stationView.R_HandShake_HB;
-                    this.lbl_Warning_HB.Text = "蹇冭烦:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_HB);
+                    this.lbl_Warning_HB.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_HB);
 
                     this.lbl_Mode_FX.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_FX);
                     this.lbl_XinTiao_FX.Text = "蹇冭烦:" + stationView.R_HandShake_FX;
-                    this.lbl_Warning_FX.Text = "蹇冭烦:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FX);
+                    this.lbl_Warning_FX.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FX);
 
                     ////鏄剧ずRGV浠诲姟瀹屾垚鍜屽畬鎴愮‘璁や俊鍙�
                     //this.lbl_R_RGV_Finish.Text = "RGV浠诲姟瀹屾垚:" + rgvView.R_RGV_Finish;
@@ -696,6 +615,61 @@
         }
 
 
+        /// <summary>
+        /// 鑾峰彇Station 鎶ヨ淇℃伅
+        /// </summary>
+        /// <param name="obj"></param>
+        private async void GetStationWarningInfo(object obj)
+        {
+            while (true)
+            {
+                Thread.Sleep(3000);//1绉掗挓璇诲彇涓�娆�
+                try
+                {
+                    if (stationServiceClient == null)
+                    {
+                        continue;
+                    }
+
+                    Stopwatch main = new Stopwatch();
+                    main.Start();
+
+                    iWareCC.StationService.DeviceWarningInfo[] waringList = await stationServiceClient.GetWaringInfoListAsync((int)EDevice.Station, configDeviceWarningList.wmsConfigDeviceWarnings.ToArray());
+
+                    main.Stop();
+                    var milliseconds = main.ElapsedMilliseconds;  //-- 鎿嶄綔鏃堕棿锛堟绉掞級
+
+                    //鏄剧ず鎶ヨ淇℃伅
+                    List<String> warningCodeList = new List<string>();
+                    if (waringList != null && waringList.Length > 0)
+                    {
+                        for (int i = 0; i < waringList.Length; i++)
+                        {
+                            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);//鏂板鎶ヨ
+                            warningCodeList.Add(findObj.WarningCode);
+                        }
+
+                    }
+                    else
+                    {
+
+                    }
+                    DeviceWarningHandler.AutoCloseWarning(EDevice.Station, iWareCommon.Utils.LogType.StationThreadService, warningCodeList);//鑷姩鍏抽棴鎶ヨ
+
+                    //*/
+                }
+                catch (Exception ex)
+                {
+                    rgvView = null;
+                    Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.StationThreadService, "鑾峰彇绔欑偣淇℃伅鍑虹幇寮傚父:" + ex.Message, ex);
+                    continue;
+                }
+            }
+        }
+
+
 
         #endregion
 
@@ -715,14 +689,17 @@
                 {
                     if (SystemValue.isAllowRuning_DeleteData && SystemValue.isStartedModel)
                     {
-                        ClearDataHandler.Delete_Base_SysExceptionInfo(7);
-                        ClearDataHandler.Delete_Task_RequestLog(7);
-                        ClearDataHandler.Delete_Task_Part(10);
-                        ClearDataHandler.Delete_Device_Warning(30);
-                        ClearDataHandler.Delete_HttpRequestRecord(14);
+                        ClearDataHandler.Delete_wms_record_print(10);
+                        ClearDataHandler.Delete_mes_push_papercut(30);
+                        //鍘绘帀杩欎釜鍒犻櫎楠岃瘉  銆怑ditby shaocx,2025-09-17銆�
+                        //ClearDataHandler.Delete_mes_push_packagecode(10);
+                        ClearDataHandler.Delete_wms_rbline_task(30);
 
-                        ClearDataHandler.Delete_MES_BTJReceiveReq(30);
-                        ClearDataHandler.Delete_MES_OnLineReq(30);
+                        //ClearDataHandler.Delete_Device_Warning(30);
+                        //ClearDataHandler.Delete_HttpRequestRecord(14);
+
+                        //ClearDataHandler.Delete_MES_BTJReceiveReq(30);
+                        //ClearDataHandler.Delete_MES_OnLineReq(30);
 
                         LogTextHelper.BatchDeleteLog();
 
@@ -1279,224 +1256,34 @@
 
 
 
-        private void button5_Click(object sender, EventArgs e)
-        {
-            if (SystemValue.isStartedModel)
-            {
-                WZ.Useful.Commons.MessageUtil.ShowError("鎵嬪姩搴撲綅缁存姢锛岄渶瑕佸皢妯″紡鍏抽棴锛�");
-                return;
-            }
-            //鎵嬪姩搴撲綅缁存姢
-            SrmStockForm frm = new SrmStockForm();
-            frm.ShowDialog();
-        }
 
 
 
 
-        private void btn_TongJi_Click(object sender, EventArgs e)
-        {
-            //缁熻
-
-            int store_FDJ = 0;//鐜版湁鍙戝姩鏈烘暟
-            int store_EmptySalver = 0;//绌烘墭鐩樻暟閲�
-            int store_EmptySalver_TS = 0;//绌烘墭鐩樻墭鏁�
-
-            int count_In_FDJ = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏戝彂鍔ㄦ満
-            int count_In_EmptySalver = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏� 绌烘墭鐩�
-            int count_In_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏� 绌烘墭鐩樻墭鏁�
-
-            int count_Out_FDJ = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏戝彂鍔ㄦ満
-            int count_Out_EmptySalver = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏� 绌烘墭鐩�
-            int count_Out_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏� 绌烘墭鐩樻墭鏁�
-
-            int count_ZY_EmptySalver = 0;//鏌ヨ鏌愬ぉ杞繍浜嗗灏� 绌烘墭鐩�
-            int count_ZY_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ杞繍浜嗗灏� 绌烘墭鐩樻墭鏁�
-
-            //鏌愭鏃堕棿鐨勭粺璁�
-            var str_start = this.dateTimePicker_Start.Value.ToString("yyyy-MM-dd" + " " + "00:00:00");
-            var str_end = this.dateTimePicker_End.Value.ToString("yyyy-MM-dd" + " " + "23:59:59");
-            var start = Convert.ToDateTime(str_start);
-            var end = Convert.ToDateTime(str_end);
-
-            int allPlacesCount = 0;
-            using (DbModel edm = new DbModel())
-            {
-
-                var queryMaterialType_涓�鑸墿鏂� = (int)MaterialTypeEnum.涓�鑸墿鏂�;
-                var queryMaterialType_鎵樼洏 = (int)MaterialTypeEnum.鎵樼洏;
-                var queryInOutFlag_In = (int)MainInOutFlagEnum.鍏ュ簱;
-                var queryInOutFlag_Out = (int)MainInOutFlagEnum.鍑哄簱;
-                var queryInOutFlag_ZY = (int)MainInOutFlagEnum.杞繍;
-
-                var allPlaces = edm.Base_Station.Where(x => x.IsSrmStation == true).ToList();
-                allPlaces = StationHandler.FindCommonFilter(allPlaces);
-                allPlacesCount = allPlaces.Count;
-
-                store_FDJ = edm.V_Store.Where(x => x.MaterialType == queryMaterialType_涓�鑸墿鏂�).Count();
-
-
-                store_EmptySalver_TS = edm.V_Store.Where(x => x.MaterialType == queryMaterialType_鎵樼洏).Count();
-                store_EmptySalver = store_EmptySalver_TS == 0 ? 0 : edm.V_Store.Where(x => x.MaterialType == queryMaterialType_鎵樼洏).Sum(x => (int)x.Qty);
 
 
 
-                //鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏戝彂鍔ㄦ満
-                var taskState = (int)MainTaskStatusEnum.宸插畬鎴�;
-                count_In_FDJ = edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_涓�鑸墿鏂� && x.InOutFlag == queryInOutFlag_In && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Count();
-
-                //鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏戞墭鐩�
-                count_In_EmptySalver_TS = edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_In && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Count();
-                count_In_EmptySalver = count_In_EmptySalver_TS == 0 ? 0 : edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_In && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Sum(x => (int)x.Qty);
-
-                //鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏戝彂鍔ㄦ満
-                count_Out_FDJ = edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_涓�鑸墿鏂� && x.InOutFlag == queryInOutFlag_Out && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Count();
-
-                //鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏戞墭鐩�
-                count_Out_EmptySalver_TS = edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_Out && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Count();
-                count_Out_EmptySalver = count_Out_EmptySalver_TS == 0 ? 0 : edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_Out && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end)).Sum(x => (int)x.Qty);
-
-                //鏌ヨ鏌愬ぉ杞繍浜嗗灏戞墭鐩橈紙娉ㄦ剰锛氬彧鏌ヨ鍘�1014浣嶇疆鐨勶級
-                count_ZY_EmptySalver_TS = edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_ZY && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end) && x.RealToPlace == "1014").Count();
-                count_ZY_EmptySalver = count_ZY_EmptySalver_TS == 0 ? 0 : edm.Task_Main.Where(x => x.MaterialType == queryMaterialType_鎵樼洏 && x.InOutFlag == queryInOutFlag_ZY && x.TaskState == taskState && (x.FinishTime >= start && x.FinishTime <= end) && x.RealToPlace == "1014").Sum(x => (int)x.Qty);
-
-            }
-
-            //鏄剧ず
-            //var aa = "\r\n";
-            var str = "";
-            str += "鏃堕棿鑼冨洿: " + str_start + "鑷�" + str_end + " \r\n";
-            str += "==================銆愬簱瀛樸��========================= \r\n";
-            str += "鐜版湁鍙戝姩鏈烘暟: " + store_FDJ + "  \r\n";
-            str += "鐜版湁绌烘墭鐩樻暟: " + store_EmptySalver + " \r\n";
-            str += "鐜版湁绌烘墭鐩樻墭鏁�: " + store_EmptySalver_TS + " \r\n";
-            str += "鎬诲簱浣�" + allPlacesCount + ",鏈夊彂鍔ㄦ満鎴栨墭鐩樺簱浣�" + (store_FDJ + store_EmptySalver_TS) + ",搴撳瓨鍗犳瘮: " + CSharpHelper.ExecPercent((store_FDJ + store_EmptySalver_TS), allPlacesCount) + " \r\n";
-            str += "\r\n";
-
-            str += "==================銆愬叆搴撱��========================= \r\n";
-            str += "鍏ュ簱鍙戝姩鏈烘暟: " + count_In_FDJ + " \r\n";
-            str += "鍏ュ簱绌烘墭鐩樻暟: " + count_In_EmptySalver + " \r\n";
-            str += "鍏ュ簱绌烘墭鐩樻墭鏁�: " + count_In_EmptySalver_TS + " \r\n";
-            str += "\r\n";
-
-            str += "==================銆愬嚭搴撱��========================= \r\n";
-            str += "鍑哄簱鍙戝姩鏈烘暟: " + count_Out_FDJ + " \r\n";
-            str += "鍑哄簱绌烘墭鐩樻暟: " + count_Out_EmptySalver + " \r\n";
-            str += "鍑哄簱绌烘墭鐩樻墭鏁�: " + count_Out_EmptySalver_TS + " \r\n";
-            str += "\r\n";
-
-            str += "==================銆愯浆杩愭墭鐩樸��========================= \r\n";
-            str += "杞繍绌烘墭鐩樻暟: " + count_ZY_EmptySalver + " \r\n";
-            str += "杞繍绌烘墭鐩樻墭鏁�: " + count_ZY_EmptySalver_TS + " \r\n";
-            str += "\r\n";
-
-            this.tb_TongJi.Text = str;
-        }
-
-        private void checkBox_NowDay_CheckedChanged(object sender, EventArgs e)
-        {
-            if (this.checkBox_NowDay.Checked)
-            {
-                dateTimePicker_Start.Value = DateTime.Now;
-                dateTimePicker_End.Value = DateTime.Now;
-            }
-        }
-
-        private void rBOnlyIn_CheckedChanged(object sender, EventArgs e)
-        {
-            SetModelCheckBoxToSystemValue();
-        }
-
-        private void btnSMQZYZTG1_Click(object sender, EventArgs e)
-        {
-            DobtnSMQZYZTG(EDevice.涓�鍙峰爢鍨涙満);
-        }
-
-        private void DobtnSMQZYZTG(EDevice device)
-        {
-            MessageBoxButtons messButton = MessageBoxButtons.OKCancel;
-            DialogResult dr = MessageBox.Show("娉ㄦ剰锛氬叆搴撳彛鎵爜寮哄埗楠岃瘉閫氳繃鍔熻兘锛屼粎閫傜敤浜庢壂鐮佸櫒娌℃湁鎵埌鐮侊紝浣嗘槸瀹為檯鎵樼洏鐮佸拰鍫嗗灈鏈鸿鎵ц鐨勪换鍔℃墭鐩樼爜涓�鑷寸殑鎯呭喌锛佸鏋滃爢鍨涙満瑕佹墽琛岀殑浠诲姟璺熷疄闄呮墭鐩樼爜涓嶇锛岃涓嶈鐐瑰嚮璇ユ寜閽紝鍙婃椂鑱旂郴绠$悊鍛樿繃鏉ュ鐞嗐�傛偍纭畾瑕佹搷浣滃悧?", "纭", messButton);
-            if (dr == DialogResult.OK)//濡傛灉鐐瑰嚮鈥滅‘瀹氣�濇寜閽�
-            {
-                var stationCode = MyExtendHelper.GetRgvStationCodeBySrm(device);
-                var srm = FormCC.srmViewDict[(int)device];
-                //鍙湁褰撳爢鍨涙満鏈変换鍔℃墽琛屾椂锛屽苟涓旀槸鍏ュ簱浠诲姟鐨勬椂鍊欐墠鍒ゆ柇
-                var realSrmSourcePlace = (int)device + "-" + srm.SrmSourcePlace;
-                if (srm.R_TaskNo > 0 && (srm.R_State == (int)ESrmState.鍙栬揣涓� || srm.R_State == (int)ESrmState.鍙栬揣瀹氫綅涓�)
-                   && SysGloble.Dict_SpecialPlace_IN.ContainsKey(realSrmSourcePlace))
-                {
-                    var result = MyExtendHelper.WriteScanValidateACK(false, "鍏ュ簱鍙f壂鐮佸己鍒堕獙璇侀�氳繃", stationCode, srm.R_TaskNo, true, "", "");
-                    if (result)
-                    {
-                        MyExtendHelper.SetSrm_IN_SMQZYZTG(device, true);
-                        MessageBox.Show("鍏ュ簱鍙f壂鐮佸己鍒堕獙璇侀�氳繃 鎴愬姛锛�");
-                    }
-                    else
-                    {
-                        MessageBox.Show("鍏ュ簱鍙f壂鐮佸己鍒堕獙璇侀�氳繃 澶辫触锛�");
-                    }
-                }
-                else
-                {
-                    MessageBox.Show(device.ToString() + "浠诲姟鍙蜂笉鏄ぇ浜�0锛屾垨鑰� 鐘舵�佷笉鏄� '鍙栬揣涓�'鎴�'鍙栬揣瀹氫綅涓�'锛屼笉鍏佽鎿嶄綔");
-                }
-            }
-            else//濡傛灉鐐瑰嚮鈥滃彇娑堚�濇寜閽�
-            {
-
-            }
-        }
 
 
-        private void button22_Click(object sender, EventArgs e)
-        {
-            var cargNo = this.tb_wlm.Text.Trim();
-            var ret = WmsRequestHelper.test_getEngineInfo(cargNo);
 
 
-            //杞崲鍚�
-            MesRetModel2<MesRetProductModel> retModel = JsonConvert.DeserializeObject<MesRetModel2<MesRetProductModel>>(ret);
 
-            this.tb_TongJi.Text = "MES杩斿洖锛�" + ret + "\r\n" +
-                "杞崲鍚�:" + "\r\n" +
-                JsonConvert.SerializeObject(retModel)
-                ;
-        }
-
-        private void button23_Click(object sender, EventArgs e)
-        {
-            var cargNo = this.tb_wlm.Text.Trim();
-            var ret = WmsRequestHelper.test_btjReceive(cargNo);
-
-
-            //杞崲鍚�
-            MessageModel<string> retModel = JsonConvert.DeserializeObject<MessageModel<string>>(ret);
-
-            this.tb_TongJi.Text = "WMS杩斿洖锛�" + ret + "\r\n" +
-                "杞崲鍚�:" + "\r\n" +
-                JsonConvert.SerializeObject(retModel);
-        }
-
-        private void lbl_Alert_Place1014ClearStoreTask_Click(object sender, EventArgs e)
-        {
-
-        }
 
         private void button24_Click(object sender, EventArgs e)
         {
-            //寮哄埗璇ュ寘鍙峰嚭搴�
-            var packageCode = this.tb_PackageCode.Text.Trim();
+            ////寮哄埗璇ュ寘鍙峰嚭搴�
+            //var packageCode = this.tb_PackageCode.Text.Trim();
 
-            var alertMsg = "";
-            CC_DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg);
-            if (!string.IsNullOrEmpty(alertMsg))
-            {
-                MessageBox.Show("閿欒:" + alertMsg);
-            }
-            else
-            {
-                MessageBox.Show("宸插鐞�");
-            }
+            //var alertMsg = "";
+            //CC_DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg);
+            //if (!string.IsNullOrEmpty(alertMsg))
+            //{
+            //    MessageBox.Show("閿欒:" + alertMsg);
+            //}
+            //else
+            //{
+            //    MessageBox.Show("宸插鐞�");
+            //}
         }
 
         private void button25_Click(object sender, EventArgs e)
@@ -1520,6 +1307,145 @@
                     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))
+            {
+                MessageBox.Show("閿欒:" + alertMsg);
+            }
+            else
+            {
+                MessageBox.Show("宸插鐞�");
+            }
+        }
+
+        private void btn1_Click(object sender, EventArgs e)
+        {
+            var taskNo = this.tb_taskNo.Text.Trim();
+
+            var alertMsg = "";
+            using (WmsDBModel wmsDB = new WmsDBModel())
+            {
+                var task = wmsDB.wms_rbline_task.Where(x => x.TaskNo == taskNo && x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟 && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�).FirstOrDefault();
+                if (task == null)
+                {
+                    MessageBox.Show("娌℃壘鍒颁换鍔�");
+                    return;
+                }
+
+                var upiCode = task.Upi;
+                var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
+                if (upiObj == null)
+                {
+                    MessageBox.Show($"鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ");
+                    return;
+                }
+                //澧炲姞搴撳瓨
+                wms_stock_quan qun = new wms_stock_quan()
+                {
+                    Id = Yitter.IdGenerator.YitIdHelper.NextId(),
+                    Shelf = upiObj.Shelf,
+                    Upi = upiCode,
+                    PlanNo = task.PlanNo,
+                    DetailName = upiObj.DetailName,
+                    OrderId = task.OrderId,
+                    CreateTime = DateTime.Now,
+                    CreateUserName = SysGloble.WCSSystem,
+                    InTime = DateTime.Now,
+                    OperReason = "鍏ュ簱",
+                    PackageCode = task.PackageCode,
+                    Length = task.Length,
+                    Width = task.Width,
+                    Thk = task.Thk,
+                    PlaceCode = task.PlaceCode,
+                    StockStatus = (int)StockStatusEnum.鍦ㄥ簱,
+                    StockStatusName = StockStatusEnum.鍦ㄥ簱.ToString(),
+
+                };
+                wmsDB.wms_stock_quan.Add(qun);
+
+                task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
+                task.FinishedTime = DateTime.Now;
+
+
+                var place = StationHandler.GetPlaceByPlaceCode(task.PlaceCode, wmsDB);
+                place.PlaceStatus = (int)PlaceStatusEnum.姝e父;
+
+
+                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, "缂撳瓨鍏ュ簱瀹屾垚:" + task.PlaceCode);
+
+                wmsDB.SaveChanges();
+            }
+            if (!string.IsNullOrEmpty(alertMsg))
+            {
+                MessageBox.Show("閿欒:" + alertMsg);
+            }
+            else
+            {
+                MessageBox.Show("宸插鐞�");
+            }
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            //鏇存柊搴撳瓨琛ㄤ腑鐨勬搴忓瓧娈�
+            var alertMsg = "";
+            using (WmsDBModel db = new WmsDBModel())
+            {
+                //鏌ヨ绔嬩綋搴撲腑鐨剈pi鍒楄〃
+                var quanList = db.wms_stock_quan.ToList();
+                var query_quanList = quanList.Select(x => x.Upi).ToList();
+                var upiList = db.mes_batchOrderUPI_new.Where(x => query_quanList.Contains(x.UPI)).ToList();
+                foreach (var item in quanList)
+                {
+                    var _shelf = upiList.Find(x => x.UPI == item.Upi);
+                    item.Shelf = _shelf.Shelf;
+                }
+
+
                 db.SaveChanges();
             }
             if (!string.IsNullOrEmpty(alertMsg))

--
Gitblit v1.9.3