111
cjs
2025-06-23 5ccc957c0e4768336e3272346942e1d5e2f14624
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; }
@@ -423,8 +427,8 @@
                        }
                        else
                        {
                            var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("timeStamp", timeStamp), "TimeCuoInfoCom");
                            CMMLog.Info($"WMSIn-{startBit}:{ItemCode}:查询条件:timeStamp={timeStamp},读出 TimeCuoInfoComTwo 表数据为:{JsonConvert.SerializeObject(time)}");
                            var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoComTwo>(Query.EQ("TimeCuo", timeStamp), "TimeCuoInfoComTwo");
                            CMMLog.Info($"WMSIn-{startBit}:{ItemCode}:查询条件:TimeCuo={timeStamp},读出 TimeCuoInfoComTwo 表数据为:{JsonConvert.SerializeObject(time)}");
                            var erpItemTableInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", time.materialCode), "ERPItemTable");
                            CMMLog.Info($"WMSIn-{startBit}:查询条件:item_code={time.materialCode},读出 ERPItemTable 表数据为:{JsonConvert.SerializeObject(erpItemTableInfo)}");
                            if (ItemCode == "time" && time != null && erpItemTableInfo != null)
@@ -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,