1

cjs

1 天以前 ff48949f706e899725c1ef7d0426c12c2b3e674f

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs

@@ -404,10 +404,28 @@
                    CMMLog.Info($"WMSIn-{startBit}:ItemCode不为空，获取信息！111!");
                    CMMLog.Info($"{ItemCode}");

                    if (ItemCode == "time" || ItemCode == "拆盘变更" || ItemCode == "打包下线")
                    if (ItemCode == "电钴打包下线")
                    {
                        model.trayCode = trayCode;
                        model.endArea = endArea;
                        //将数据插入中间表
                        if(!ERPService.senderpTaskDG(startBit, trayCode))
                        {
                            return false;
                        }
                    }
                    else if (ItemCode == "time" || ItemCode == "拆盘变更" || ItemCode == "打包下线")
                    {
                        CMMLog.Info($"{trayCode}");
                        var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), "TimeCuoInfoCom");
                        TimeCuoInfoCom time = new TimeCuoInfoCom { };
                        if (trayCode.Contains("MES"))
                        {
                            time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStampMES", trayCode), "TimeCuoInfoCom");
                        }
                        else
                        {
                            time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), "TimeCuoInfoCom");
                        }
                        if (ItemCode == "time" && time != null)
                        {
                            int TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp : int.Parse(timeStamp);
@@ -509,16 +527,6 @@
                            });
                            //将数据插入中间表
                            ERPService.senderpTask(time, startBit);
                        }
                        else if (ItemCode == "四钴打包下线")
                        {
                            var DGinfoList = MongoDBSingleton.Instance.FindAll<DGPackingLineFullModel>("DGPackingLineFullModel");
                            if(DGinfoList.Count > 0){
                                var DGinfo = DGinfoList.OrderBy(a => a.createTime).First();
                                model.trayCode = DGinfo.trayCode;
                                //将数据插入中间表
                                ERPService.senderpTaskDG(startBit);
                            }
                        }
                    }
                    else