白盒获取装配料号更新

Ben Lin

2024-10-15 3ddaef6f21b25269ad0e9fb5b8ba5588090c9389

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -89,7 +89,7 @@
                                info.InputQty = CurOperInfo(input.Locale).InputQty;
                                action.Data.OperInfo = info;
                            }
                            else if (!IsFinishAllSteps)
                            else if (Steps.Any() && !IsFinishAllSteps)
                            {
                                action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
                            }
@@ -165,29 +165,30 @@
                            //查找不到条码已绑定的工单
                            else
                            {
                                //没有当前工单，则先选择工单后再扫描条码
                                if (CurBatch.IsNullOrEmpty())
                                var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault();
                                if (!lastSn.IsNullOrEmpty())
                                {
                                    action.Data.ShortMsg = new("未选择工单", ShortMessage.Types.Error);
                                    action.Data.ShortMsg = new($"产品{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
                                    action.Data.OperInfo = new();
                                    action.IsSuccessed = false;
                                    //action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
                                    //action.LocaleMsg = new($"进站扫描错误，条码[{0}]{1}", input.SN);
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.SnStatusError", input.SN, lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
                                }
                                //有当前工单且不是投入，则提示条码未投入生产，请先去首站扫描
                                else
                                {
                                    var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault();
                                    if (!lastSn.IsNullOrEmpty())
                                    //没有当前工单，则先选择工单后再扫描条码
                                    if (CurBatch.IsNullOrEmpty())
                                    {
                                        action.Data.ShortMsg = new($"产品{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
                                        action.Data.ShortMsg = new("未选择工单", ShortMessage.Types.Error);
                                        action.Data.OperInfo = new();
                                        action.IsSuccessed = false;
                                        //action.LocaleMsg = new($"进站扫描错误，条码[{0}]{1}", input.SN);
                                        action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN);
                                        //action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
                                        action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
                                    }
                                    //有当前工单且不是投入，则提示条码未投入生产，请先去首站扫描
                                    else
                                    {

                                        action.Data.ShortMsg = new("未投入生产", ShortMessage.Types.Error);
                                        action.Data.OperInfo = new();
                                        action.IsSuccessed = false;
@@ -648,6 +649,7 @@
                    wipSN.NODE_NAME = curNode.NODE_NAME;
                    wipSN.OPER_CODE = curNode.OPER_CODE;
                    wipSN.SEGMENT = curNode.SEGMENT;
                    wipSN.OPERATION_TIME = DateTime.Now;
                }

                var wipHiss = new List<MES_WIP_HIS>();
@@ -662,15 +664,29 @@
                var _woSns = woSNs.Clone();
                var _wipSns = CurWipSNs.Clone();
                var _wipHiss = wipHiss.Clone();
                var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item) : new();
                //保存数据
                endAction = () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Storageable(_woSns, UserCode).ExecuteCommand();
                    db.Storageable(_wipSns, UserCode).ExecuteCommand();
                    db.Updateable(_woSns, UserCode).UpdateColumns(q =>new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
                    db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME }).ExecuteCommand();
                    db.Storageable(_wipHiss, UserCode).ExecuteCommand();
                    if (_pkgList.Any())
                    {
                        foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
                        {
                            //包装信息保存到生产过程记录
                            db.Updateable<MES_WIP_HIS>()
                                .SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
                                .SetColumns(q => q.INNER_SN == q.CARTON_SN)
                                .SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
                                .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.OPER_CODE == "EndNode")
                                .ExecuteCommand();
                        }
                    }
                };
            }