111
cjs
2025-06-23 5ccc957c0e4768336e3272346942e1d5e2f14624
111
3个文件已修改
185 ■■■■ 已修改文件
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs 155 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -24,6 +24,7 @@
using System.Net.Configuration;
using static System.Runtime.CompilerServices.RuntimeHelpers;
using System.Reflection.Emit;
using System.Text.RegularExpressions;
namespace Hanhe.iWCS.TaizhouGEMTwoProtocol
{
@@ -1068,7 +1069,6 @@
                    WriteCacheStackingData(plc, task, machine);
                    var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                    {
                        addr = plc.writeAddr + 1,
@@ -1094,11 +1094,12 @@
                //读取通道1里面参数是否为1,判断叠盘机是否需要上料
                var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                {
                    dataNum = 1,
                    dataNum = 2,
                    addr = pmInfo.readAddr + 1,
                    host = pmInfo.ip,
                    port = pmInfo.port
                });
                CMMLog.Info($"获取碟盘入口信息:{JsonConvert.SerializeObject(result)}");
                if (result != null && result.errCode == 0)
                {
                    //参数1表示叠托点申请入料
@@ -1114,6 +1115,66 @@
                            else CMMLog.Debug($"调用WMS获取碟盘出库生成任务失败!");
                        }
                        else CMMLog.Debug($"检查当前叠托点是否有任务占用,或者MST主表中有缓存架入叠盘机的任务!");
                    }
                    if (pmInfo.deviceType == "23" && result.result[1] == 1)
                    {
                        //四钴车间,人工上料模式
                        result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                        {
                            dataNum = 21,
                            addr = pmInfo.readAddr + 120,
                            host = pmInfo.ip,
                            port = pmInfo.port
                        });
                        CMMLog.Info($"获取碟盘人工上料写入信息:{JsonConvert.SerializeObject(result)}");
                        if (result != null && result.errCode == 0)
                        {
                            string lotNo = RemoveNull(GetTrayCode(result.result.Skip(0).Take(20).ToArray()).Trim().ToString()); //批次号
                            string bagNumber = Convert.ToInt32(Completion(result.result[20]), 2).ToString();
                            var machinInfo = MongoDBSingleton.Instance.FindOne<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", lotNo), Query.EQ("packageCode", bagNumber)), "MachineInfoTwoTetracobalt");
                            if(machinInfo != null)
                            {
                                TN_I_TASK_MST task = new TN_I_TASK_MST
                                {
                                    CN_S_BATCH_NO = machinInfo.trayCode
                                };
                                WMSInfo machine = new WMSInfo
                                {
                                    location = machinInfo.location,
                                    productWeight = machinInfo.productWeight,
                                    oneTrayWeight = machinInfo.oneTrayWeight,
                                    addState = machinInfo.addState,
                                    packageCode = machinInfo.packageCode,
                                    itemCode = machinInfo.materialCode
                                };
                                PLCControl.WriteCacheStackingData(pmInfo, task,machine);
                                machinInfo = MongoDBSingleton.Instance.FindOne<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", lotNo), Query.EQ("packageCode", bagNumber)), "MachineInfoTwoTetracobalt");
                                if(machinInfo == null)
                                {
                                    //信息写入成功
                                    var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                    {
                                        addr = pmInfo.writeAddr + 2,
                                        host = pmInfo.ip,
                                        port = pmInfo.port,
                                        data = 1
                                    });
                                    CMMLog.Info("人工叠包信息查询成功,写入1");
                                }
                            }
                            else
                            {
                                var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                {
                                    addr = pmInfo.writeAddr + 2,
                                    host = pmInfo.ip,
                                    port = pmInfo.port,
                                    data = 2
                                });
                                CMMLog.Info("人工叠包信息查询失败,写入2");
                            }
                        }
                    }
                }
                else CMMLog.Debug($"缓存入叠盘机,创建任务,result={result.errMsg}");
@@ -1249,17 +1310,17 @@
            num[8] = int.Parse(AsciiToTen(machine.location));//包装机号
            for (int b = 9; b <= 10; b++)
            {
                int k = b % 2 == 0 ? 0 : 16;
                int k = b % 2 == 0 ? 16 : 0;
                num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machine.productWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
            }
            for (int b = 11; b <= 12; b++)
            {
                int k = b % 2 == 0 ? 0 : 16;
                int k = b % 2 == 0 ? 16 : 0;
                num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machineInfoTwo.trayCodeWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
            }
            for (int b = 13; b <= 14; b++)
            {
                int k = b % 2 == 0 ? 0 : 16;
                int k = b % 2 == 0 ? 16 : 0;
                num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machine.oneTrayWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
            }
            for (int b = 15; b <= 16; b++)
@@ -1308,9 +1369,17 @@
            for (int x = maxLength + 1; x <= 54; x++) num[x] = 0;//将产品批次号无数据的通道全部置为 0
            #endregion
            #region   55~64 => 61~70 产品型号
            #region   55~64 => 61~70 产品型号(四钴产品型号有中文和英文)
            ERPService.HandleItemInfoChina(machine.itemCode, 55, 64, num);// 中文处理 55~64 61~70
            if (Regex.IsMatch(ErpItemInfo.item_spec, @"[\u4e00-\u9fff]"))
            {
                ERPService.HandleItemInfoChina(ErpItemInfo.item_spec, 55, 64, num);// 中文处理 55~64 61~70
            }
            else
            {
                ERPService.HandleItemInfo(ErpItemInfo.item_spec, 55, 64, num);
            }
            //string data2 = machine.itemCode;
            //CMMLog.Info($"51~50data2_1:{data2}");
@@ -3655,7 +3724,7 @@
                            if (result != null && result.errCode == 0 && result.result.Count() > 0)
                            {
                                //1:取料
                                if (result.result[0] == 1)
                                if (result.result[0] == 1 || result.result[0] == 5)
                                {
                                    string PlcBit02 = Settings.GetPlcInfo().Where(a => a.deviceType == "22").FirstOrDefault().location;
                                    //包装下线任务,终点为复称位置(这里判断包装机起点,复称起点终点均无任务,则推送任务)
@@ -3712,7 +3781,7 @@
                                                                port = pmInfo.port,
                                                                data = 4
                                                            });
                                                            CMMLog.Debug($"(四钴车间)包装下线流程-{pmInfo.location}:ip:{pmInfo.ip},port:{pmInfo.port},addr:{pmInfo.writeAddr},写入4");
                                                            //string timeStamp = ProcessHelper.GetTimeStamp(31, 1, 1);
                                                            //tray.trayCode = "VW" + timeStamp;
                                                            //MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("_id", tray._id), Update.Set("trayCode", tray.trayCode), UpdateFlags.None);
@@ -3726,22 +3795,57 @@
                                                            }
                                                            else if (tray.trayCode != "0" && !string.IsNullOrEmpty(tray.trayCode))
                                                            {
                                                                HHAmsExecuteResult req = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), pmInfo.location, PlcBit02, "3楼包装取料(四钴)", 0, tray.trayCode, timeStamp);
                                                                if (req.success)
                                                                if (result.result[0] == 1)
                                                                {
                                                                    string weight = (double.Parse(tray.oneTrayWeight) / 100).ToString();
                                                                    ERPService.packageInfo(tray.machineNo, tray.trayCode, tray.lotNo, weight);
                                                                    //记录托盘类型
                                                                    var trayTypeInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", pmInfo.location), "trayTypeTable");
                                                                    if(trayTypeInfo == null)
                                                                    HHAmsExecuteResult req = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), pmInfo.location, PlcBit02, "3楼包装取料(四钴)", 0, tray.trayCode, timeStamp);
                                                                    if (req.success)
                                                                    {
                                                                        MongoDBSingleton.Instance.Insert<trayTypeTable>(new trayTypeTable
                                                                        string weight = (double.Parse(tray.oneTrayWeight) / 100).ToString();
                                                                        ERPService.packageInfo(tray.machineNo, tray.trayCode, tray.lotNo, weight);
                                                                        //记录托盘类型
                                                                        var trayTypeInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", pmInfo.location), "trayTypeTable");
                                                                        if (trayTypeInfo == null)
                                                                        {
                                                                            locCode = pmInfo.location,
                                                                            trayType = tray.trayType
                                                                        });
                                                                            MongoDBSingleton.Instance.Insert<trayTypeTable>(new trayTypeTable
                                                                            {
                                                                                locCode = pmInfo.location,
                                                                                trayType = tray.trayType
                                                                            });
                                                                        }
                                                                    }
                                                                }
                                                                else
                                                                {
                                                                    //var writeRes0 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                                                    //{
                                                                    //    host = pmInfo.ip,
                                                                    //    addr = pmInfo.writeAddr,
                                                                    //    data = 5,//原先是1,单个写入
                                                                    //    port = pmInfo.port
                                                                    //});
                                                                    //人工模式,无需生成任务
                                                                    //删除MachineInfoTetracobalt表中的数据
                                                                    MongoDBSingleton.Instance.Remove<MachineInfoTetracobalt>(Query.And(Query.EQ("machineNo", pmInfo.location), Query.EQ("trayCode", tray.trayCode)), "MachineInfoTetracobalt", RemoveFlags.None);
                                                                    //删除 MachineInfoTwoTetracobalt 重复的数据
                                                                    var twoInfo = MongoDBSingleton.Instance.Find<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", tray.lotNo), Query.EQ("packageCode",tray.packageCode)), "MachineInfoTwoTetracobalt");
                                                                    if(twoInfo.Count > 1)
                                                                    {
                                                                        foreach(var a in twoInfo)
                                                                        {
                                                                            MongoDBSingleton.Instance.Remove<MachineInfoTwoTetracobalt>(Query.EQ("_id", a._id),RemoveFlags.None);
                                                                            if (MongoDBSingleton.Instance.Find<MachineInfoTwoTetracobalt>(Query.And(Query.EQ("lotNo", tray.lotNo), Query.EQ("packageCode", tray.packageCode)), "MachineInfoTwoTetracobalt").Count == 1)
                                                                            {
                                                                                break;
                                                                            }
                                                                        }
                                                                    }
                                                                    //记录包装间下料信息
                                                                    string Weight = (decimal.Parse(tray.oneTrayWeight) / 100).ToString("F2");
                                                                    MongoDBSingleton.Instance.Insert<packageInfoModel>(new packageInfoModel { machineNo = tray.machineNo, trayCode = tray.trayCode, batchNo = tray.lotNo, time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), weight = Weight });
                                                                }
                                                            }
                                                        }
@@ -4182,14 +4286,14 @@
                        result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                        {
                            dataNum = 15,
                            addr = plc.readAddr + 140,
                            dataNum = 70,
                            addr = plc.readAddr + 110,
                            host = plc.ip,
                            port = plc.port
                        });
                        CMMLog.Info($"下线口,ip:{plc.ip},port:{plc.port},addr:{plc.readAddr + 140},result:{JsonConvert.SerializeObject(result)}");
                        string materialCode = RemoveNull(GetTrayCode(result.result.Skip(0).Take(15).ToArray()).Trim().ToString());
                        string lotNo = RemoveNull(GetTrayCode(result.result.Skip(0).Take(20).ToArray()).Trim().ToString());
                        string materialCode = RemoveNull(GetTrayCode(result.result.Skip(30).Take(15).ToArray()).Trim().ToString());
                        CMMLog.Info($"下线口:timeCuoData:{timeCuoData},empCode:{empCode},machineCode:{machineCode},needWeight:{needWeight},oneWeight:{oneWeight},readWeight:{readWeight}" +
                            $",fcWeight:{fcWeight},trayType:{trayType},addState:{addState},bagNumber:{bagNumber},productTime:{productTime},TimeCuo:{timeCuoData}");
                        var timeTwo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("TimeCuo", timeCuoData), "TimeCuoInfoComTwo");
@@ -4209,6 +4313,7 @@
                                bagNumber = bagNumber,
                                productData = productTime.ToString(),
                                TimeCuo = timeCuoData,
                                lotNo = lotNo,
                                materialCode = materialCode
                            }, "TimeCuoInfoComTwo");
                        }
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
@@ -240,8 +240,11 @@
                        AMSHelper.SetStatus(action.CN_S_TASK_NO, 1, "4", action.CN_S_DEVICE_CODE, true);
                        if (mst.CN_S_BUSS_TYPE == "3楼包装补空") PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT);
                        if (mst.CN_S_BUSS_TYPE.Contains("3楼包装取料")) 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 (mst.CN_S_BUSS_TYPE == "3楼缓存架入叠托") PLCControl.writeStackingMouth6(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);
                            PLCControl.writeStackingMouth6(mst.CN_S_END_BIT, mst.CN_S_TASK_NO);
                        }
                        if (mst.CN_S_BUSS_TYPE == "包装线补空") PLCControl.PickUpBlankCompleteTetracobalt(mst.CN_S_END_BIT, mst.CN_S_START_BIT);
                        //四钴车间根据起点改变货位托盘类型绑定关系
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/WMSHelper.cs
@@ -164,6 +164,10 @@
            //物料编号:itemCode
            //物料数量:qty
            public string itemCode { get; set; }
            //物料名称
            public string itemName { get; set; }
            //物料规格
            public string itemModel { get; set; }
            //public string itemFeature { get; set; }
            //public string itemState { get; set; }
            //public string ProductionDate { get; set; }
@@ -432,14 +436,18 @@
                                CMMLog.Info($"WMSIn-{startBit}:time获取时间戳数据为:{time.TimeCuo}!");
                                model.data.Add(new ItemData()
                                {
                                    itemCode = erpItemTableInfo.item_code,
                                    lotNo = erpItemTableInfo.item_spec,
                                    itemCode = erpItemTableInfo.item_spec,
                                    itemName = erpItemTableInfo.item_name,
                                    itemModel = erpItemTableInfo.item_spec,
                                    lotNo = time.lotNo,
                                    machineNo = time.packingMachineNumber.ToString(),
                                    packageCode = time.bagNumber.ToString(),
                                    foldingbag = time.isFold.ToString(),
                                    timeStamp = int.Parse(time.TimeCuo),
                                    realWeight = time.realWeight,
                                    productWeight = time.needWeight.ToString(),
                                    oneTrayWeight = time.realWeight.ToString(),
                                    Jm_Item_Code = erpItemTableInfo.item_code,
                                    Jm_Item_Name = erpItemTableInfo.item_name,
                                    Jm_Item_Model = erpItemTableInfo.item_spec,
@@ -463,7 +471,9 @@
                            string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
                            model.data.Add(new ItemData()
                            {
                                itemCode = product,
                                itemCode = info.materialCode,
                                itemName = erpItemTableInfo.item_name,
                                itemModel = erpItemTableInfo.item_spec,
                                lotNo = info.lotNo,
                                machineNo = info.machineNo,
                                packageCode = info.packageCode,
@@ -646,10 +656,11 @@
                            CMMLog.Info($"WMSInTwo-{startBit}:查询条件:item_code={info.materialCode},读出 ERPItemTable 表数据为:{JsonConvert.SerializeObject(erpItemTableInfo)}");
                            model.locationGear = info.secondNg.ToString();
                            model.trayCode = info.trayCode;
                            string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
                            model.data.Add(new ItemData()
                            {
                                itemCode = product,
                                itemCode = erpItemTableInfo.item_spec,
                                itemName = erpItemTableInfo.item_name,
                                itemModel = erpItemTableInfo.item_spec,
                                lotNo = info.lotNo,
                                machineNo = info.machineNo,
                                packageCode = info.packageCode,