111

cjs

2025-06-23 03c175086d7ae1b8f8b3683bf85f03d234863218

111

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/.vs/Hanhe.iWCS.JingmenGEMNorthProtocol/FileContentIndex/71956fd8-5918-4262-870b-ee510f8a529b.vsidx

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs

@@ -1155,10 +1155,10 @@
                                //读取复称平台的重量
                                //Convert.ToInt32(Completion(result[8]) + Completion(result[9]), 2).ToString()
                                //(decimal.Parse(tray.oneTrayWeight1) / 100).ToString("F2");
                                string weight = (decimal.Parse(Convert.ToInt32(Completion(result.result[6]) + Completion(result.result[7]), 2).ToString()) / 100).ToString("F2");
                                string weight = (decimal.Parse(Convert.ToInt32(Completion(result.result[4]) + Completion(result.result[5]), 2).ToString()) / 100).ToString("F2");

                                CMMLog.Debug($"SecondWeightActionOne: 读取设备{plc.location},ip:{plc.ip}通道{plc.readAddr + 7}里面数据为{result.result[6]}.");
                                CMMLog.Debug($"SecondWeightActionOne: 读取设备{plc.location},ip:{plc.ip}通道{plc.readAddr + 8}里面数据为{result.result[7]}.");
                                CMMLog.Debug($"SecondWeightActionOne: 读取设备{plc.location},ip:{plc.ip}通道{plc.readAddr + 4}里面数据为{result.result[4]}.");
                                CMMLog.Debug($"SecondWeightActionOne: 读取设备{plc.location},ip:{plc.ip}通道{plc.readAddr + 5}里面数据为{result.result[5]}.");
                                //double x = (double)Convert.ToInt32(Completion(result[8]) + Completion(result[9]), 2) / 100;
                                //CMMLog.Info($"SecondWeightActionOne: 读取设备{plc.location},ip:{plc.ip}通道{plc.readAddr + 4}里面数据为{result.result[3]}.");
                                CMMLog.Info($"SecondWeightActionOne: weight:{weight}");
@@ -1174,8 +1174,6 @@
                        }
                        else CMMLog.Info($"SecondWeightActionOne: packageInfoModel未找到数据，machineNo:{model.machince},trayCode:{model.ext2}");
                        #endregion



                        string PlcBit02 = Settings.GetPlcInfo().Where(a => a.deviceType == "2").FirstOrDefault().location;
                        UpdateBuilder update = Update.Set("ng", result.result[2]);
@@ -1199,7 +1197,7 @@
            if (infoTwo != null)
            {
                //var newWeight = (Convert.ToInt32(Completion(result[6]) + Completion(result[7]), 2) / 100).ToString();
                var newWeight =  result[6] + "," + result[7];
                var newWeight =  result[5] + "," + result[6];
                //更新数据
                CMMLog.Info($"从复称平台获取的物料重量：{newWeight}");


 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ProtocolAnalysis.cs

@@ -235,9 +235,9 @@
                    {
                        CMMLog.Info($"SetStatus:收到任务号 4:{action.CN_S_TASK_NO}");
                        CMMLog.Info($"收到信号：{action.CN_N_ACTION_CODE},任务号：{action.CN_S_TASK_NO}，开始根据任务号查询主表中对应数据！");
                        WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
                        if (mst.CN_S_BUSS_TYPE == "包装线补空") PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT, mst.CN_S_START_BIT);
                        if (mst.CN_S_BUSS_TYPE.Contains("包装取料")) PLCControl.CheckUpReqUnload(mst.CN_S_END_BIT, mst.CN_S_TASK_NO);
                        if (mst.CN_S_BUSS_TYPE == "3楼缓存架入叠托") WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
                    }
                    if (action.CN_N_ACTION_CODE == 5)
                    {

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.AGVWebService.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.AGVWebService.dll.config

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Business.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Common.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.DeviceDriver.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Event.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Factroy.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Interface.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.JingmenGEMNorthProtocol.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.JingmenGEMNorthProtocol.dll.config

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.JingmenGLMNorthTCP.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.MData.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Hanhe.iWCS.Model.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.Host.HttpListener.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.Host.HttpListener.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.Hosting.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.Hosting.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Microsoft.Owin.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/MongoDB.Bson.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/MongoDB.Driver.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/MySql.Data.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Newtonsoft.Json.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Newtonsoft.Json.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/Owin.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/ServiceStack.Text.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/SqlSugar.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/SuperSocket.Common.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/SuperSocket.SocketBase.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Net.Http.Formatting.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Net.Http.Formatting.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Web.Http.Owin.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Web.Http.Owin.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Web.Http.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/System.Web.Http.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/log4net.dll

Binary files differ

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/log4net.xml

File was deleted

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/dll/settings.xml

File was deleted