111

cjs

昨天 7a3f33acdb9057a61699fa2043ed47b7cb0e35cb

111

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs

@@ -455,7 +455,7 @@
                        {
                            if (req.isSuccess)
                            {
                                var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("packingMachineNumber", models.machineNo), "TimeCuoInfoCom");
                                var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStampMES", req.data.mesCode), "TimeCuoInfoCom");
                                if (timeCuo == null)
                                {
                                    MongoDBSingleton.Instance.Insert<TimeCuoInfoCom>(new TimeCuoInfoCom
@@ -492,7 +492,7 @@
                                }
                                else
                                {
                                    var query = Query.EQ("packingMachineNumber", models.machineNo);
                                    var query = Query.EQ("timeStampMES", req.data.mesCode);
                                    //变更注释
                                    UpdateBuilder update = Update.Set("isFold", 1).Set("packingMachineNumber", models.machineNo).Set("needWeight", (int)req.data.FMustQty)
                                        .Set("realWeight", (int)req.data.FMustQty).Set("totalWeight", (int)req.data.FMustQty).Set("batchNumber", req.data.Flot)
@@ -565,7 +565,6 @@
                                                        data = 4
                                                    });
                                                }

                                            }
                                        }
                                        else CMMLog.Debug("打包下线口接驳位点位未配置");
@@ -581,7 +580,6 @@
                            {
                                result.errMsg = req.msg;
                            }
                            
                        }
                        else
                        {

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs

@@ -1995,12 +1995,12 @@
            return paddedData1;
        }

        internal static void senderpTask(TimeCuoInfoCom time, string startBit)
        internal static void senderpTask(TimeCuoInfoCom time, string startBit, string trayCode)
        {
            try
            {
                CMMLog.Info("插入SendErpTaskInfoTable 表 开始:" + JsonConvert.SerializeObject(time));
                var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.EQ("timeStamp", time.timeStamp.ToString()), "SendErpTaskInfoTable");
                var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.EQ("timeStamp", trayCode.ToString()), "SendErpTaskInfoTable");
                if (erpInfo == null)
                {
                    //string fEntryId = time.FEntryID_1.ToString() + (time.FEntryID_2 == 0 ? "" : ";" + time.FEntryID_2.ToString()) + (time.FEntryID_3 == 0 ? "" : ";" + time.FEntryID_3.ToString()) + (time.FEntryID_4 == 0 ? "" : ";" + time.FEntryID_4.ToString());
@@ -2019,7 +2019,7 @@
                        materialSpec = time.productModel,
                        lotCode = time.batchNumber,
                        totalWeight = time.totalWeight,
                        timeStamp = time.timeStamp.ToString(),
                        timeStamp = trayCode.ToString(),
                        productTime = Convert.ToDateTime(time.ProductionDate).AddHours(8),
                        invalidationTime = Convert.ToDateTime(time.ProductionDate).AddHours(8).AddDays(365),
                        dateTime = DateTime.Now.AddHours(8),

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs

@@ -526,7 +526,7 @@
                                JournalId = time.FEntryID_1.ToString(),
                            });
                            //将数据插入中间表
                            ERPService.senderpTask(time, startBit);
                            ERPService.senderpTask(time, startBit, trayCode);
                        }
                    }
                    else