blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
kazelee
8 天以前 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 
 core/WCSCore.cs


@@ -195,7 +195,7 @@


            try {


                ModbusHelper.Relink();




                var BZQ = Settings.GetTaskInfo(ETask.M满托下线入库).StartAreas;


                var BZQ = ETask.M满托下线入库.StartAreas();


                var loc = db.Queryable<TN_Location>()


                    .Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First();




@@ -327,7 +327,7 @@


                    LogHelper.Info($"物料编码不存在!");


                }




                var model = new OtherModel.PickUpReturnErpInfo {


                var model = new ErpModel.PickUpReturnErpInfo {


                    jhdh = plan.JHDH, // 计划单号 (唯一标识) 


                    ckzt = plan.CKZT, // 出库状态 (需要返回) 


                    jhlb = plan.JHLB, // 计划类别


@@ -491,10 +491,10 @@


        public static (bool, string) CreateInboundTask(string startLocCode, string cntrCode) {


            var db = new SqlHelper<object>().GetInstance();




            var taskInfo = Settings.GetTaskInfo(ETask.M满托下线入库);


            var taskName = taskInfo.TaskName;


            var startAreas = taskInfo.StartAreas;


            var endAreas = taskInfo.EndAreas;


            var tInfo = ETask.M满托下线入库.Info();


            var taskName = tInfo.TaskName;


            var startAreas = tInfo.StartAreas;


            var endAreas = tInfo.EndAreas;


            const string cntrType = "托盘";




            try {


@@ -533,7 +533,7 @@


                }




                var cntId = locCntrRel.S_CNTR_CODE;


                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, cntId, taskName);


                var task = WCSHelper.BuildTaskAndLockLoc(startLoc, endLoc, cntId, taskName);




                using (var tran = db.Ado.UseTran()) {


                    if (locCntrRelOld != null) {