From 9597b1df912c1ca4401a74970d9472e268b3a9c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 07 12月 2024 15:12:59 +0800
Subject: [PATCH] 33

---
 CC/iWareCC_ASRS/WCF/CCWcfService.cs |  222 ++----------------------------------------------------
 1 files changed, 11 insertions(+), 211 deletions(-)

diff --git a/CC/iWareCC_ASRS/WCF/CCWcfService.cs b/CC/iWareCC_ASRS/WCF/CCWcfService.cs
index debd05f..a67adc4 100644
--- a/CC/iWareCC_ASRS/WCF/CCWcfService.cs
+++ b/CC/iWareCC_ASRS/WCF/CCWcfService.cs
@@ -1,6 +1,8 @@
 锘�
 using iWareCC.BLL;
 using iWareCC.Common.Helper;
+using iWareCC.SrmService;
+using iWareCC.StationService;
 using iWareCommon.Utils;
 using iWareModel;
 using iWareModel.Entity;
@@ -23,44 +25,6 @@
     // 娉ㄦ剰: 浣跨敤鈥滈噸鏋勨�濊彍鍗曚笂鐨勨�滈噸鍛藉悕鈥濆懡浠わ紝鍙互鍚屾椂鏇存敼浠g爜鍜岄厤缃枃浠朵腑鐨勭被鍚嶁�淐CWcfService鈥濄��
     public class CCWcfService : ICCWcfService
     {
-        /// <summary>
-        /// MES鎻愪緵鏌愪釜鍙戝姩鏈虹殑璇︾粏淇℃伅
-        /// </summary>
-        /// <param name="_barCode"></param>
-        public string getEngineInfo(string mes_url, string XiGang_Mes_Url_getEngineInfo, string token, string _barCode)
-        {
-            return MyMesService.getEngineInfo(mes_url, XiGang_Mes_Url_getEngineInfo, token, _barCode);
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧鍧愭爣
-        /// </summary>
-        /// <returns></returns>
-        public DeviceCoordinat GetDeviceCoordinat()
-        {
-            DeviceCoordinat result = null;
-            try
-            {
-                result = new DeviceCoordinat()
-                {
-
-                };
-
-                result.RgvCoordinate = FormCC.rgvView.R_RGV_Coordinate;
-
-                result.Srm1Coordinat = FormCC.srmViewDict[(int)EDevice.涓�鍙峰爢鍨涙満].R_PosXmm.ToString();
-                result.Srm2Coordinat = FormCC.srmViewDict[(int)EDevice.浜屽彿鍫嗗灈鏈篯.R_PosXmm.ToString();
-                result.Srm3Coordinat = FormCC.srmViewDict[(int)EDevice.涓夊彿鍫嗗灈鏈篯.R_PosXmm.ToString();
-                result.Srm4Coordinat = FormCC.srmViewDict[(int)EDevice.鍥涘彿鍫嗗灈鏈篯.R_PosXmm.ToString();
-
-                return result;
-            }
-            catch (Exception ex)
-            {
-                Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "GetDeviceCoordinat鍑虹幇寮傚父锛�" + ex.Message, ex);
-                return result;
-            }
-        }
 
         /// <summary>
         /// 妯″紡鏄惁姝e湪杩愯
@@ -72,55 +36,23 @@
         }
 
         /// <summary>
-        /// 鐢熸垚鏈�鏂扮殑浠诲姟搴忓垪鍙�
+        /// 琛ユ澘宸ヤ綅鍏佽杩涙澘
         /// </summary>
-        /// <param name="edm"></param>
         /// <returns></returns>
-        public TaskSequenceEntity GenerateTaskSequence()
+        public FunRetEntity WriteStation_AllowIn()
         {
             try
             {
-                using (DbModel edm = new DbModel())
+                using (StationServiceClient client = new StationServiceClient())
                 {
-                    TaskSequenceEntity entity = new TaskSequenceEntity();
-                    entity = MainTaskHandler.GetTaskSequenceEntity(edm);
-                    return entity;
+                    var res = client.WriteStation_AllowIn((int)EDevice.Station, true, StationLocationEnum.BZ39.ToString());
+                    if (!res.result)
+                    {
+                        return FunRetEntity.Fail(res.resMsg);
+                    }
                 }
-            }
-            catch (Exception ex)
-            {
-                Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "GenerateTaskSequence鍑虹幇寮傚父锛�" + ex.Message, ex);
-                return null;
-            }
-        }
 
-
-
-        /// <summary>
-        /// 缁勭洏鍏ュ簱
-        /// </summary>
-        /// <param name="taskSequence"></param>
-        /// <param name="taskSequenceGuid"></param>
-        /// <param name="isBtj"></param>
-        /// <param name="Task_InStoreSlaver"></param>
-        /// <param name="request"></param>
-        /// <param name="userName"></param>
-        /// <param name="userId"></param>
-        /// <param name="inStoreNo">鍏ュ簱鍙�</param>
-        /// <returns></returns>
-        public FunRetEntity SalverMaterialBind(bool isValidate1015ScanValue,
-            bool isBtj,
-            C_Task_InStoreSlaverParam Task_InStoreSlaver, C_AnalyzeMaterialPostParam request,
-            string userName, int userId, string inStoreNo)
-        {
-            try
-            {
-                var ret = SalverMaterialBindBLL.SalverMaterialBind(isValidate1015ScanValue, isBtj, Task_InStoreSlaver, request, userName, userId, inStoreNo);
-                if (ret.success)
-                {
-                    return FunRetEntity.Success("鎴愬姛");
-                }
-                return FunRetEntity.Fail(ret.msg);
+                return FunRetEntity.Success("鎴愬姛", "");
             }
             catch (Exception ex)
             {
@@ -128,139 +60,7 @@
             }
         }
 
-        /// <summary>
-        /// 閲嶆柊鎵弿杈撻�佺嚎1015涓婄殑鎵樼洏鍙�
-        /// </summary>
-        /// <returns></returns>
-        public FunRetEntity Write1015ReScan(bool value)
-        {
-            try
-            {
-                if (WCSConfigHelper.GetConfig_IsSimulationPLC())
-                {
-                    return FunRetEntity.Success("妯℃嫙鎴愬姛", "");
-                }
 
-                using (RgvService.RgvServiceClient client = new RgvService.RgvServiceClient())
-                {
-                    iWareCC.RgvService.SdaResEntity result = client.Write1015ReScan((int)EDevice.RGV, value);
-                    if (result.result)
-                    {
-                        return FunRetEntity.Success("鎴愬姛", "");
-                    }
-                    else
-                    {
-                        return FunRetEntity.Fail(result.resMsg, "");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                return FunRetEntity.Fail("鑾峰彇杈撻�佺嚎1015涓婃壂鎻忕殑鎵樼洏鍙峰嚭鐜板紓甯�:" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇杈撻�佺嚎1015涓婄殑鎵弿鍊�
-        /// </summary>
-        /// <returns></returns>
-        public FunRetEntity GetScanValueFor1015()
-        {
-            try
-            {
-                //娉ㄦ剰锛氳繖閲屾槸妯℃嫙鐨勶紝鍙戝竷瑕佹敼杩囨潵鍟婏紒锛侊紒
-                if (WCSConfigHelper.GetConfig_IsSimulationPLC())
-                {
-                    return FunRetEntity.Success("妯℃嫙鎴愬姛", "XGT000205");
-                }
-
-                return FunRetEntity.Success("鎴愬姛", FormCC.rgvView.R_1015_Scan);
-            }
-            catch (Exception ex)
-            {
-                return FunRetEntity.Fail("鑾峰彇杈撻�佺嚎1015涓婃壂鎻忕殑鎵樼洏鍙峰嚭鐜板紓甯�:" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 閲嶆柊鎵弿杈撻�佺嚎1019涓婄殑鎵樼洏鍙�
-        /// </summary>
-        /// <returns></returns>
-        public FunRetEntity Write1019ReScan(bool value)
-        {
-            try
-            {
-                if (WCSConfigHelper.GetConfig_IsSimulationPLC())
-                {
-                    return FunRetEntity.Success("妯℃嫙鎴愬姛", "");
-                }
-
-                using (RgvService.RgvServiceClient client = new RgvService.RgvServiceClient())
-                {
-                    iWareCC.RgvService.SdaResEntity result = client.Write1019ReScan((int)EDevice.RGV, value);
-                    if (result.result)
-                    {
-                        return FunRetEntity.Success("鎴愬姛", "");
-                    }
-                    else
-                    {
-                        return FunRetEntity.Fail(result.resMsg, "");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                return FunRetEntity.Fail("鑾峰彇杈撻�佺嚎1019涓婃壂鎻忕殑鎵樼洏鍙峰嚭鐜板紓甯�:" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇杈撻�佺嚎1019涓婄殑鎵弿鍊�
-        /// </summary>
-        /// <returns></returns>
-        public FunRetEntity GetScanValueFor1019()
-        {
-            try
-            {
-                //娉ㄦ剰锛氳繖閲屾槸妯℃嫙鐨勶紝鍙戝竷瑕佹敼杩囨潵鍟婏紒锛侊紒
-                if (WCSConfigHelper.GetConfig_IsSimulationPLC())
-                {
-                    return FunRetEntity.Success("妯℃嫙鎴愬姛", "XGT000205");
-                }
-                else
-                {
-                    return FunRetEntity.Success("鎴愬姛", FormCC.rgvView.R_1019_Scan);
-                }
-            }
-            catch (Exception ex)
-            {
-                return FunRetEntity.Fail("鑾峰彇杈撻�佺嚎1019涓婃壂鎻忕殑鎵樼洏鍙峰嚭鐜板紓甯�:" + ex.Message);
-            }
-        }
-
-        #region 1015鍜�1019
-        #endregion
-
-
-        /// <summary>
-        /// 瀵绘壘绌洪棽鐨勭珛搴撶┖搴撲綅 (鏅�氱墿鏂�)
-        /// </summary>
-        /// <returns></returns>
-        public Base_Station FindBestEmptyPlaceForOrdinaryMaterial(string orderNo)
-        {
-            try
-            {
-                using (DbModel edm = new DbModel())
-                {
-                    var item = StationHandler.FindBestEmptyPlaceForOrdinaryMaterial(edm, orderNo, MaterialTypeEnum.涓�鑸墿鏂�);
-                    return item;
-                }
-            }
-            catch (Exception ex)
-            {
-                return null;
-            }
-        }
 
     }
 }

--
Gitblit v1.9.3