过程变量更新

Ben Lin

2024-09-26 7597357e268f6ecf19b50a122e42ccb896295329

 Tiger.Business.MES/Transaction/Position.cs

@@ -141,7 +141,7 @@
                {
                    OperInfoDic.Add(CurBatch.Batch.BATCH_NO, new());
                }
                

                action.Data = new { WorkOrder = CurBatch.WO, Bacth = CurBatch.Batch };
            }
            catch (Exception ex)
@@ -206,7 +206,7 @@
            OperInfo info = new();
            if (CurBatch?.Batch?.BATCH_NO != null)
            {
                info = OperInfoDic[CurBatch.Batch.BATCH_NO ];
                info = OperInfoDic[CurBatch.Batch.BATCH_NO];
                info.StepsInfo = Steps.Select(q => q.GetInfo(locale)).ToList();
            }
            return info;
@@ -359,17 +359,17 @@
                    if (CurStep.IsFinished && NextSteps.Any())
                    {
                        result = BeginNextActionStep(input);
                    } 
                    }
                    else
                    {
                       //返回结果到客户端
                       result = canBegin;
                       result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
                        //返回结果到客户端
                        result = canBegin;
                        result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
                    }
                    return result;
                }
                //工序被重置
                else if(Steps.IsNullOrEmpty())
                else if (Steps.IsNullOrEmpty())
                {
                    return canBegin;
                }
@@ -511,8 +511,18 @@
                                    return WorkBatch.Product.ToJson();
                                case "GetCustomer":
                                    return WorkBatch.Batch.ToJson();
                                case "GetModel":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
                                case "GetInput":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
                                case "GetOutput":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
                                case "GetPower":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
                                case "GetAccuracy":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
                                case "GetVarByWo":
                                    return GetLabelVarWo(lv);
                                    return GetLabelVarWo(lv, "");
                                default:
                                    return "";
                            }
@@ -548,7 +558,7 @@
                                case "GetCartonGenerate":
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                                case "GetHW21SNGenerate":
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:","05").Data.ToString() ?? "";
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
                                default:
                                    return "";
                            }
@@ -565,7 +575,7 @@
        /// </summary>
        /// <param name="labelId"></param>
        /// <returns></returns>
        private string GetLabelVarWo(BAS_LABEL_VAR lv)
        private string GetLabelVarWo(BAS_LABEL_VAR lv, string value)
        {
            string result = "";
            var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
@@ -575,7 +585,7 @@
            }
            else
            {
                result = labelVarwos.Count > 0 ? labelVarwos[0].DEFAULT_VALUE : "";
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
            }
            return result;
        }
@@ -602,7 +612,7 @@
                    int year = date.Year + ((date - firstDay).TotalDays + daysOffset < 0 ? -1 : 0);
                    int week = CultureInfo.CurrentCulture.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Sunday);
                    dic.Add(sn, $"{year.ToString().Substring(2, 2)}{week:00}");
                } 
                }
                else
                {
                    dic.Add(sn, "");