11

cjs

7 天以前 b7dcf71a817da7b0bea591b8a5d3ab53b0aea136

 ams/Hanhe.iWCS.JingmenGLMNorthProtocol/WMSHelper.cs

@@ -93,6 +93,10 @@
            /// 托盘码
            /// </summary>
            public string trayCode { get; set; }
            /// <summary>
            /// 托盘类型
            /// </summary>
            public string trayType { get; set; }
            public string locationGear { get; set; }
            public List<ItemData> data { get; set; }
            //public List<TimeData> TimeData { get; set; }
@@ -106,6 +110,7 @@
            public string endBit { get; set; }
            public string trayDimension { get; set; }
            public string needCreateAMSTask { get; set; }
            public string TrayType { get; set; }
            public int priority { get; set; }
            //public int isFull { get; set; }
            public string projectCode { get; set; }
@@ -119,6 +124,7 @@
            public string endBit { get; set; }
            public string trayDimension { get; set; }
            public string needCreateAMSTask { get; set; }
            public string trayType { get; set; }
            public int priority { get; set; }
            //public int isFull { get; set; }
            public string projectCode { get; set; }
@@ -426,6 +432,7 @@
                            //CMMLog.Info($"WMSIn-{startBit}:查询条件：item_code={info.materialCode},读出 ERPItemTable 表数据为：{JsonConvert.SerializeObject(erpItemTableInfo)}");
                            model.locationGear = info.secondNg.ToString();
                            model.trayCode = info.trayCode;
                            model.trayType = info.trayType == "1" ? "田字托" : info.trayType == "2" ? "川字托" : "";
                            //string product = !string.IsNullOrEmpty(info.productType) ? info.productType : erpItemTableInfo.item_spec;
                            model.data.Add(new ItemData()
                            {
@@ -497,7 +504,7 @@
            return result;
        }

        public static bool WMSOut(string endBit, string ItemCode) {
        public static bool WMSOut(string endBit, string ItemCode,string trayType) {
            //endBit = endBit.Substring(0, 9);
            bool result = false;
            HardwareAccessObject hao = HardwareAccessHelper.Instance.GetEquipmentsHAO(Constants.WMS_DEVICE_TYPE_WMS);
@@ -508,6 +515,7 @@
                model.endBit = endBit;
                model.projectCode = "glm";
                model.needCreateAMSTask = "Y";
                model.TrayType = trayType;
                //model.Data = new List<ItemData>();
                //if (!string.IsNullOrEmpty(ItemCode))
                //{
@@ -547,7 +555,7 @@
            return result;
        }

        public static bool WMSEmptyOut(string endBit, string ItemCode, ref string taskNo, ref string trayCode)
        public static bool WMSEmptyOut(string endBit, string ItemCode,string trayType, ref string taskNo, ref string trayCode)
        {
            bool result = false;
            HardwareAccessObject hao = HardwareAccessHelper.Instance.GetEquipmentsHAO(Constants.WMS_DEVICE_TYPE_WMS);
@@ -559,6 +567,7 @@
                model.endBit = endBit;
                model.projectCode = "glm";
                model.needCreateAMSTask = "Y";
                model.trayType = trayType;
                string msgData = JsonConvert.SerializeObject(model);
                string reqStr = "物料名=" + ItemCode + ";";
                string feedback = "";