111

cjs

12 小时以前 e0471620ed16295a330ce18bcfe1654c91138996

111

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx

Binary files differ

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx

Binary files differ

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs

@@ -487,6 +487,7 @@
                                        //变更注释
                                        totalNeedWeight = (int)req.data.FMustQty,
                                        FEntryID_1 = 0,
                                        orderCode = ""
                                    });
                                }
                                else
@@ -553,17 +554,17 @@
                                                //上报条码表
                                                CMMLog.Info($"INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
                                                new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
                                                //var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
                                                //if(plc != null)
                                                //{
                                                //    var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                                //    {
                                                //        addr = plc.writeAddr,
                                                //        host = plc.ip,
                                                //        port = plc.port,
                                                //        data = 4
                                                //    });
                                                //}
                                                var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
                                                if(plc != null)
                                                {
                                                    var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                                    {
                                                        addr = plc.writeAddr,
                                                        host = plc.ip,
                                                        port = plc.port,
                                                        data = 4
                                                    });
                                                }

                                            }
                                        }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -601,10 +601,10 @@
            var plc = Settings.GetPlcInfo().Where(a => a.ip == ip).FirstOrDefault();
            //ASM写入通道0小车动作，1-取料
            int[] num = new int[2] { 1, 1 };
            //if(type == "PDA打包下线")
            //{
            //    num[0] = 4;
            //}
            if(type == "PDA打包下线")
            {
                num[0] = 4;
            }
            var writeRes0 = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
            {
                host = ip,

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -353,7 +353,7 @@
            //if (plc != null || mst.CN_S_BUSS_TYPE == "3楼复称入缓存架")
            CMMLog.Info($"{mst.CN_S_END_BIT}");
            CMMLog.Info($"{plc}");
            if (plc != null || mst.CN_S_BUSS_TYPE == "3楼打包下线")
            if (plc != null || mst.CN_S_BUSS_TYPE == "3楼打包下线" || mst.CN_S_BUSS_TYPE == "PDA打包下线")
            {
                CMMLog.Info($"进入{mst.CN_S_BUSS_TYPE}流程{code}的处理");
                if (code == 1013)
@@ -945,14 +945,14 @@
                        new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{endMachLoc}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(endMachLoc)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");

                        var plcTwo = Settings.GetPlcInfo().Where(a => a.location == endMachLoc && a.enable == 1).First();
                        //int[] num = new int[1] { 1 };
                        //var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                        //{
                        //    addr = plcTwo.writeAddr + 1,
                        //    host = plcTwo.ip,
                        //    data = num,
                        //    port = plcTwo.port
                        //});
                        int[] num = new int[1] { 1 };
                        var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                        {
                            addr = plcTwo.writeAddr + 1,
                            host = plcTwo.ip,
                            data = num,
                            port = plcTwo.port
                        });

                        result = true;
                    }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs

@@ -348,7 +348,7 @@
            /// <summary>
            /// 时间戳
            /// </summary>
            public int timeStamp { get; set; }
            public string timeStamp { get; set; }
            /// <summary>
            /// 照片url
            /// </summary>
@@ -428,7 +428,7 @@
                        }
                        if (ItemCode == "time" && time != null)
                        {
                            int TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp : int.Parse(timeStamp);
                            string TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp.ToString() : timeStamp;
                            CMMLog.Info($"time获取时间戳数据，获取信息！");
                            model.data.Add(new ItemData()
                            {
@@ -468,7 +468,7 @@

                                foldingbag = "1",
                                //totalWeight = time.totalWeight,
                                timeStamp = 1,
                                timeStamp = "1",
                                photoURL = "1",
                                //productType = time.productModel,
                                //bagNumber = time.bagNumber,
@@ -480,7 +480,7 @@
                        }
                        else if (ItemCode == "打包下线")
                        {
                            int TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp : int.Parse(trayCode);
                            string TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp.ToString() : trayCode;
                            //List<string> batchList = time.batchNumber.Split('-').ToList();
                            //string batch = "";
                            //for(int i = 0; i < 1; i++)
@@ -594,7 +594,17 @@
                        var wmsResponse = JsonConvert.DeserializeObject<WMSResponseModel>(feedback);
                        //var res = feedback.Replace("{", "").Replace("}", "").Replace(":", "=").Replace(",", ";").Replace('"', ' ');
                        if (wmsResponse.Success == true) {
                            if(ItemCode == "打包下线") MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
                            if (ItemCode == "打包下线")
                            {
                                if (trayCode.Contains("MES"))
                                {
                                    MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStampMES", trayCode), RemoveFlags.Single);
                                }
                                else
                                {
                                    MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
                                }
                            }
                            msg = $"WMSIn-{startBit}:【调用wms获取入库货位】成功！返回结果=" + wmsResponse.Success + ";调用WebUrl=" + url + ";输入参数=" + msgData;
                        }
                        else {