增加销售订单

Rodney Chen

2024-08-14 5b0cab677e7d899c6ab6629ee6645b297b6b8c9f

 Tiger.Business.MES/WorkAction/Assembly.cs

@@ -180,6 +180,7 @@
                                {
                                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                                    WIP_ID = wipSn.ID,
                                    SN = input.SN,
                                    PROD_SN = wipSn.SN,
                                    ITEM_CODE = item.ItemInfo.ITEM_CODE,
@@ -203,30 +204,34 @@
                        }
                        else 
                        {
                            var record = new MES_WIP_ASSY()
                            foreach (var wipSn in CurPosition.CurWipSNs)
                            {
                                AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                                AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                                SN = input.SN,
                                PROD_SN = CurPosition.CurSN,
                                ITEM_CODE = item.ItemInfo.ITEM_CODE,
                                QTY = 1,
                                UNIT = item.ItemInfo.UNIT,
                                WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
                                BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
                                ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
                                NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
                                NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
                                FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
                                WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
                                LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
                                POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
                                OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
                                SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
                            };
                            item.Records.Add(record);
                                var record = new MES_WIP_ASSY()
                                {
                                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                                    WIP_ID = wipSn.ID,
                                    SN = input.SN,
                                    PROD_SN = wipSn.SN,
                                    ITEM_CODE = item.ItemInfo.ITEM_CODE,
                                    QTY = 1,
                                    UNIT = item.ItemInfo.UNIT,
                                    WORK_ORDER = wipSn.WORK_ORDER,
                                    BATCH_NO = wipSn.BATCH_NO,
                                    ROT_CODE = wipSn.ROT_CODE,
                                    NODE_ID = wipSn.NODE_ID,
                                    NODE_NAME = wipSn.NODE_NAME,
                                    FTY_CODE = wipSn.FTY_CODE,
                                    WS_CODE = wipSn.WS_CODE,
                                    LINE_CODE = wipSn.LINE_CODE,
                                    POST_CODE = wipSn.POST_CODE,
                                    OPER_CODE = wipSn.OPER_CODE,
                                    SEGMENT = wipSn.SEGMENT,
                                };
                                item.Records.Add(record);
                            }

                            if (item.Records.Sum(q => q.QTY) >= item.LoadQty * CurPosition.CurWipSNs.Count)
                            if (item.Records.Sum(q => q.QTY) / item.Records.Count >= item.LoadQty * CurPosition.CurWipSNs.Count)
                           {
                              item.IsFinished = true;
                           }
@@ -277,6 +282,7 @@
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                    WIP_ID = wipSn.ID,
                    HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                    SN = wipSn.SN,
                    STATUS = wipSn.STATUS,
@@ -294,7 +300,11 @@
                    POST_CODE = wipSn.POST_CODE,
                    OPER_CODE = wipSn.OPER_CODE,
                    SEGMENT = wipSn.SEGMENT,
                    FLOW_SN = wipSn.FLOW_SN,
                    TRAY_SN = wipSn.TRAY_SN,
                    INNER_SN = wipSn.INNER_SN,
                    CARTON_SN = wipSn.CARTON_SN,
                    PALLET_SN = wipSn.PALLET_SN,
                    OPERATION_TIME = DateTime.Now,
                    SFTS_CODE = wipSn.SFTS_CODE,
                    SFT_CODE = wipSn.SFT_CODE,
@@ -307,19 +317,22 @@
                };
                wipActs.Add(wipAct);
            }


            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipActs = wipActs.Clone();
            //整理上料记录
            var records = new List<MES_WIP_ASSY>();
            var _records = new List<MES_WIP_ASSY>();
            foreach (var item in CurAssembly.Items)
            {
                records.AddRange(item.Records);
                _records.AddRange(item.Records.Clone());
            }

            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Insertable(records, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Insertable(_records, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;