1

cjs

2025-07-04 e3d6e8ddbfc930db88bef1e7f170ddfe71b06cf1

1

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs

@@ -2040,7 +2040,7 @@

        }

        internal static void senderpTaskDG(string startBit, string trayCode)
        internal static bool senderpTaskDG(string startBit, string trayCode)
        {
            try
            {
@@ -2094,6 +2094,7 @@
                            //变更注释
                            mesSucess = "0"
                        }, "SendErpTaskInfoTableDG");
                        return true;
                    }
                    else
                    {
@@ -2109,6 +2110,8 @@

                CMMLog.Info("插入SendErpTaskInfoTableDG表 err:" + ex.Message);
            }

            return false;
        }

        internal static void SendERPTaskCompleteFuncDG()

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -4873,7 +4873,7 @@
            /// </summary>
            public string CN_T_PRODUCTION_S { get; set; }

            public int CN_S_EXT8 { get; set; }
            public string CN_S_EXT8 { get; set; }
        }

        #endregion

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -175,6 +175,32 @@
                        end.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
                    }
                }

                var conn1 = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
                if (conn1.Count == 2)
                {
                    //两个接驳平台
                    if (mst.CN_S_START_BIT == conn1[0].locCode || mst.CN_S_START_BIT == conn1[1].locCode)
                    {
                        start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
                    }
                    if (mst.CN_S_END_BIT == conn1[0].locCode || mst.CN_S_END_BIT == conn1[1].locCode)
                    {
                        end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
                    }
                }
                if (conn1.Count == 1)
                {
                    //一个接驳平台
                    if (mst.CN_S_START_BIT == conn1[0].locCode)
                    {
                        start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
                    }
                    if (mst.CN_S_END_BIT == conn1[0].locCode)
                    {
                        end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
                    }
                }
                #endregion

                string FRow = string.IsNullOrEmpty(start.CN_S_FLOOR) ? "1" : start.CN_S_FLOOR;
@@ -208,7 +234,7 @@
                        }
                    }
                }
                if (mst.CN_S_BUSS_TYPE == "缓存架入立库")
                if (mst.CN_S_BUSS_TYPE == "缓存架入立库" || mst.CN_S_BUSS_TYPE == "电钴缓存架入立库")
                {
                    TRow = "1";
                }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs

@@ -409,7 +409,10 @@
                        model.trayCode = trayCode;
                        model.endArea = endArea;
                        //将数据插入中间表
                        ERPService.senderpTaskDG(startBit, trayCode);
                        if(!ERPService.senderpTaskDG(startBit, trayCode))
                        {
                            return false;
                        }
                    }
                    else if (ItemCode == "time" || ItemCode == "拆盘变更" || ItemCode == "打包下线")
                    {