优化U9接口逻辑

Rodney Chen

2025-04-12 9ff4001a8ecec61fb01ad89aa57b08b081a8dcda

 Tiger.Business.WMS/ERP/U9C_WMS.cs

@@ -9,7 +9,6 @@
using Tiger.IBusiness;
using SqlSugar;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
using Tiger.Model.Entitys.MES.U9C;

namespace Tiger.Business.WMS
{
@@ -227,7 +226,7 @@
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE,q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE, q.PLANARRIVED_DATE, q.ORDER_DATE, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }
                if (dtls.Any())
@@ -238,7 +237,7 @@
                               .WhereColumns(t => new { t.ORDER_NO, t.ID, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY,q.PO_QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY, q.PO_QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }
                if (sns.Any())
@@ -249,7 +248,7 @@
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.SN, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SN, q.ITEM_CODE, q.QTY, q.LOTNO, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SN, q.ITEM_CODE, q.QTY, q.LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }
                if (items.Any())
@@ -303,11 +302,11 @@
            string UserCode = "U9C_In_GetReceipt";
            var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 0&& x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_U9_RECEIPT> result = new();
            List<BIZ_U9_RECEIPT_DTL> resultDt = new();
            List<BIZ_U9_RECEIPT> header = new();
            List<BIZ_U9_RECEIPT_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list
                header = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_U9_RECEIPT
                {
@@ -323,7 +322,7 @@
                    UPDATE_USER = UserCode,
                })
                .ToList();
                Logger.Scheduler.Info($"收货单表头信息存入实体中，总数：[{result.Count}]");
                Logger.Scheduler.Info($"收货单表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in list)
                {
                    BIZ_U9_RECEIPT_DTL info = new()
@@ -341,35 +340,35 @@
                        ERP_STATUS_CODE = item.Status.ToString(),
                        ERP_STATUS_NAME = item.StatusName,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"收货单明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"收货单明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.CREATE_USER, q.CREATE_TIME, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"收货单表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"收货单表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"收货单表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"收货单表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -389,13 +388,11 @@
            string UserCode = "U9C_In_GetReturn";
            var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 1 && x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_U9_RMA> result = new();
            List<BIZ_U9_RMA_DTL> resultDt = new();
            List<BIZ_U9_RMA> header = new();
            List<BIZ_U9_RMA_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_U9_RMA
                header = list.GroupBy(x => new { x.DocNo }).Select(x => new BIZ_U9_RMA
                {
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
                    ORDER_NO = x.Key.DocNo,   //单号
@@ -407,9 +404,8 @@
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_USER = UserCode,
                })
                .ToList();
                Logger.Scheduler.Info($"退货单表头信息存入实体中，总数：[{result.Count}]");
                }).ToList();
                Logger.Scheduler.Info($"退货单表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in list)
                {
                    BIZ_U9_RMA_DTL info = new()
@@ -425,35 +421,35 @@
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"退货单明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"退货单明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"退货单表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"退货单表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"退货单表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"退货单表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -474,11 +470,11 @@
            var list = db.Queryable<mes_MiscRcvTrans>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var listLine = db.Queryable<mes_MiscRcvTransLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_U9_MISC_IN> result = new();
            List<BIZ_U9_MISC_IN_DTL> resultDt = new();
            List<BIZ_U9_MISC_IN> header = new();
            List<BIZ_U9_MISC_IN_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list.Select(x => new BIZ_U9_MISC_IN
                header = list.Select(x => new BIZ_U9_MISC_IN
                {
                    ID = x.MiscRcvTransID.ToString(),
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //组织
@@ -494,10 +490,10 @@
                    UPDATE_TIME = x.ModifiedOn,
                    UPDATE_USER = UserCode,
                }).ToList();
                Logger.Scheduler.Info($"杂收单据表头信息存入实体中，总数：[{result.Count}]");
                Logger.Scheduler.Info($"杂收单据表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in listLine)
                {
                    var order = result.Where(x => x.ID == item.MiscRcvTransID.ToString()).First();
                    var order = header.Where(x => x.ID == item.MiscRcvTransID.ToString()).First();
                    BIZ_U9_MISC_IN_DTL info = new()
                    {
                        ID = item.MiscRcvTransLineID.ToString(),
@@ -524,13 +520,13 @@
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"杂收单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"杂收单据明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
@@ -540,9 +536,9 @@
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
@@ -551,8 +547,8 @@
                        y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"杂收单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"杂收单据表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"杂收单据表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"杂收单据表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -572,11 +568,11 @@
            var list = db.Queryable<mes_MiscShip>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var listLine = db.Queryable<mes_MiscShipLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_U9_MISC_OUT> result = new();
            List<BIZ_U9_MISC_OUT_DTL> resultDt = new();
            List<BIZ_U9_MISC_OUT> header = new();
            List<BIZ_U9_MISC_OUT_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list.Select(x => new BIZ_U9_MISC_OUT
                header = list.Select(x => new BIZ_U9_MISC_OUT
                {
                    ID = x.MiscShipID.ToString(),
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //组织
@@ -592,10 +588,10 @@
                    UPDATE_TIME = x.ModifiedOn,
                    UPDATE_USER = UserCode,
                }).ToList();
                Logger.Scheduler.Info($"杂发单据表头信息存入实体中，总数：[{result.Count}]");
                Logger.Scheduler.Info($"杂发单据表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in listLine)
                {
                    var order = result.Where(x => x.ID == item.MiscShipID.ToString()).First();
                    var order = header.Where(x => x.ID == item.MiscShipID.ToString()).First();
                    BIZ_U9_MISC_OUT_DTL info = new()
                    {
                        ID = item.MiscShipLineID.ToString(),
@@ -621,13 +617,13 @@
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"杂发单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"杂发单据明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
@@ -637,9 +633,9 @@
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
@@ -648,8 +644,8 @@
                        y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.OUTSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"杂发单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"杂发单据表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"杂发单据表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"杂发单据表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -668,51 +664,38 @@
            string UserCode = "U9C_In_GetScmOut";
            var list = db.Queryable<mes_SCMPickList>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_U9_SCM_OUT> result = new();
            List<BIZ_U9_SCM_OUT_DTL> resultDt = new();
            List<BIZ_U9_SCM_OUT> header = new();
            List<BIZ_U9_SCM_OUT_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.PoDocNo })
                .Select(x => new BIZ_U9_SCM_OUT
                header = list.GroupBy(x => new { x.PoId, x.PoDocNo }).Select(x => new BIZ_U9_SCM_OUT
                {
                    ID = x.Key.PoId.ToString(),   //采购单ID
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
                    ORDER_NO = x.Key.PoDocNo,   //单据号--U9的采购订单号
                    STATUS = BIZ_U9_SCM_OUT.STATUSs.Init.GetValue(), //状态
                   ORDER_DATE = x.Max(t => t.CreatedOn), //单据日期 ---创建日期
                    SUPP_ORG = x.Max(t=>t.WhCode),//供应商组织 ---供应商地点编码
                    PO_ID = x.Max(t => t.PoId).ToString(), //采购单ID
                    PO_NO = x.Key.PoDocNo, //采购单号
                    //  PREP_PERSON  备料人
                    // FINISH_TIME  备料完成时间
                    //REQ_PERSON 领料人
                    ///REQ_DEPT 领料部门
                    //DLVY_TIME 出库时间
                    //REMARK 备注
                     HANDLED = -1, //-1:未处理，0:同步处理完，>0:同步处理失败次数
                    HANDLED_DATE = DateTime.Now, //最后一次同步处理日期
                    // COMMIT_JSON 过账提交的JSON
                    //COMMIT_MSG  过账提交的返回信息
                    SUPP_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_USER = UserCode,
                })
                .ToList();
                Logger.Scheduler.Info($"委外发料单据表头信息存入实体中，总数：[{result.Count}]");
                }).ToList();
                Logger.Scheduler.Info($"委外发料单据表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in list)
                {
                    var org = db.Queryable<mes_SCMPickList>().Where(x => x.SupplyOrg == list.First().SupplyOrg).First();
                    BIZ_U9_SCM_OUT_DTL info = new()
                    {
                        ID = item.SCMPickListID.ToString(),
                        AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.SupplyOrg.ToString())?.ORG_CODE, //组织
                        ORDER_NO = item.PoDocNo,   //单据号--U9的采购订单号
                        LINE_NO = item.PickLineNo.ToString(), //单据行号
                        STATUS = BIZ_U9_SCM_OUT.STATUSs.Init.GetValue(), //状态
                        //ITEM_ID  物料ID
                        ITEM_ID = item.ItemMaster.ToString(),  //物料ID
                        ITEM_CODE = item.ItemCode, //物料编码
                        UNIT = item.IssueUOM,// UNIT 单位 
                        QTY = item.ActualReqQty,//QTY 单据数量 ---实际需求数量
                        //QTY_PREP = ,   //已备料数量 
                        QTY_DLVY = item.IssuedQty,//已发料数量
                        QTY_NOTDLVY = item.IssueNotDeliverQty,// 领料未发数量
                        DLVY_TYPE = item.IssueStyle.ToString(), // 发料方式(ERP)
@@ -723,42 +706,40 @@
                        LOCATION_ID = item.BinId.ToString(),//  储位编码(ERP)
                        LOCATION_CODE = item.BinCode, // 储位编码(ERP)
                        LOCATION_NAME = item.BinName,//  储位名称(ERP)
                        //REMARK  备注
                        AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.SupplyOrg.ToString())?.ORG_CODE, //组织
                        CREATE_TIME = item.ModifiedOn,//--时间不更新
                        CREATE_USER = UserCode,
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"委外发料单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"委外发料单据明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.ORDER_DATE,q.SUPP_ORG,q.PO_ID, q.PO_NO ,q.HANDLED ,q.HANDLED_DATE ,q.AUTH_ORG ,q.CREATE_USER ,q.UPDATE_TIME ,q.UPDATE_USER ,}).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_DATE, q.SUPP_ORG, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.QTY_DLVY, q.QTY_NOTDLVY, q.DLVY_TYPE, q.DLVY_NAME, q.WH_ID,q.WH_CODE, q.WH_NAME, q.LOCATION_ID, q.LOCATION_CODE, q.LOCATION_NAME, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.QTY_DLVY, q.QTY_NOTDLVY, q.DLVY_TYPE, q.DLVY_NAME, q.WH_ID, q.WH_CODE, q.WH_NAME, q.LOCATION_ID, q.LOCATION_CODE, q.LOCATION_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"委外发料单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"委外发料单据表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"委外发料单据表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"委外发料单据表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -778,92 +759,80 @@
            var list = db.Queryable<mes_TransferIn>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var listLine = db.Queryable<mes_TransInLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_WMS_TRANSFER> result = new();
            List<BIZ_WMS_TRANSFER_DTL> resultDt = new();
            List<BIZ_WMS_TRANSFER> header = new();
            List<BIZ_WMS_TRANSFER_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_WMS_TRANSFER
                header = list.Select(x => new BIZ_WMS_TRANSFER
                {
                    ORDER_NO = x.Key.DocNo,   //调拨单号
                    ORDER_DATE = x.Max(t => t.BusinessDate), //单据日期 
                    STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(), //状态
                      //OUT_WH_CODE  调出仓库
                   //IN_WH_CODE  拨入仓库
                   SOURCE_CODE = x.Max(t => t.TransferInDocType), //来源单据编码
                    SOURCE_ORDER = x.Max(t => t.TransferInDocTypeName), //单据类型名称
                  //ERP_ORDER  ERP单据号码
                  //REMARK 备注
                    HANDLED = -1, //-1:未处理，0:同步处理完，>0:同步处理失败次数
                    HANDLED_DATE = DateTime.Now, //最后一次同步处理日期
                    //COMMIT_JSON   过账提交的JSON
                    //COMMIT_MSG   过账提交的返回信息
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //组织
                    ID = x.TransferInId.ToString(),
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //组织
                    ORDER_NO = x.DocNo,   //调拨单号
                    ORDER_DATE = x.BusinessDate, //单据日期 
                    STATUS = BIZ_WMS_TRANSFER.STATUSs.Imported.GetValue(), //状态
                    TYPE_CODE = x.TransferInDocType, //单据类型编码
                    TYPE_NAME = x.TransferInDocTypeName, //单据类型名称
                    ERP_STATUS_CODE = x.Status.ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.StatusName, // ERP单据状态名称
                    CREATE_TIME = x.ModifiedOn,//--时间不更新
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_TIME = x.ModifiedOn,
                    UPDATE_USER = UserCode,
                })
                .ToList();
                Logger.Scheduler.Info($"调拨单据表头信息存入实体中，总数：[{result.Count}]");
                }).ToList();
                Logger.Scheduler.Info($"调拨单据表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in listLine)
                {
                    var org = db.Queryable<mes_TransferIn>().Where(x => x.TransferInId == listLine.First().TransferInId).First();
                    var order = header.Where(x => x.ID == item.TransferInId.ToString()).First();
                    BIZ_WMS_TRANSFER_DTL info = new()
                    {
                        ORDER_NO = item.TransferInId.ToString(),  //调拨单号  ---单头id
                        ID = item.TransferInLineId.ToString(),
                        AUTH_ORG = order.AUTH_ORG, //组织
                        ORDER_NO = order.ORDER_NO,  //调拨单号  ---单头id
                        ORDER_LINE = item.DocLineNo.ToString(), //调拨单行号
                        STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //单据行状态
                        ITEM_CODE = item.ItemCode, //物料编码  -- 料号
                        UNIT = item.StoreUOM,// UNIT 单位  ---调出单位
                        QTY_REQ = item.CostUOMQty,// 需求数量  --- 成本数量
                        QTY_OUT = item.StoreUOMQty,   // 调出数量  
                       // QTY_IN = item.CostUOMQty,   //  拨入数量
                        QTY_REQ = item.StoreUOMQty,// 需求数量  --- 成本数量
                        OUT_WH_CODE = item.TransOutWhCode, // 调出仓库
                        IN_WH_CODE = item.TransInWhCode, //  拨入仓库
                        OUT_LOCATION_CODE = item.TransOutBin, // 调出储位
                        IN_LOCATION_CODE = item.TransInBin, //  拨入储位
                        OUT_LOTNO = item.LotCode,//  调出批次  -- 批次
                        IN_LOTNO = item.LotCode,  //  拨入批次 -- 批次
                        //SOURCE_CODE = item.BenefitDept,//  来源单据编码
                        SOURCE_ORDER = item.TransferInId.ToString(),  // 来源单行号-- 单头ID
                        SOURCE_LINE = item.DocLineNo.ToString(),// 来源单行号 ---行号
                       // ERP_ORDER = item.InStorageReason,  //  ERP单据号码 
                         //REMARK 备注
                        AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //组织
                        CREATE_TIME = item.CreatedOn,//--时间不更新
                        CREATE_USER = item.CreatedBy,
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"调拨单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"调拨单据明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new {q.ORDER_NO, q.ORDER_DATE, q.STATUS,q.SOURCE_CODE,q.SOURCE_ORDER,q.HANDLED,q.HANDLED_DATE,    q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER,}).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_DATE, q.STATUS, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.ORDER_LINE, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY_REQ,q.QTY_OUT,q.OUT_WH_CODE,q.IN_WH_CODE,q.OUT_LOTNO,q.IN_LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY_REQ, q.OUT_WH_CODE, q.IN_WH_CODE, q.OUT_LOCATION_CODE, q.IN_LOCATION_CODE, q.OUT_LOTNO, q.IN_LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"调拨单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"调拨单据表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"调拨单据表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"调拨单据表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }
@@ -883,92 +852,84 @@
           var list = db.Queryable<mes_TransferForm>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var listLine = db.Queryable<mes_TransferFormLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
            List<BIZ_ITEM_CVT> result = new();
            List<BIZ_ITEM_CVT_DTL> resultDt = new();
            List<BIZ_ITEM_CVT> header = new();
            List<BIZ_ITEM_CVT_DTL> detail = new();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_ITEM_CVT
                header = list.Select(x => new BIZ_ITEM_CVT
                {
                    ORDER_NO = x.Key.DocNo,   //转变单号
                    ORDER_DATE = x.Max(t => t.BusinessDate), //单据日期  --业务日期
                    STATUS = BIZ_U9_MISC_IN.STATUSs.Init.GetValue(), //状态
                    ERP_TYPE_CODE = x.Max(t => t.TransferFormDocType), //ERP类型
                    ERP_TYPE_NAME = x.Max(t => t.TransferFormDocTypeName), //ERP名称
                    ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP单据状态名称
                     //REMARK 备注
                    HANDLED = -1, //-1:未处理，0:同步处理完，>0:同步处理失败次数
                    HANDLED_DATE = DateTime.Now, //最后一次同步处理日期
                    //COMMIT_JSON  过账提交的JSON
                    //COMMIT_MSG  过账提交的返回信息
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //组织
                    ID = x.TransferFormId.ToString(),
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //组织
                    ORDER_NO = x.DocNo,   //调拨单号
                    ORDER_DATE = x.BusinessDate, //单据日期 
                    STATUS = BIZ_ITEM_CVT.STATUSs.Init.GetValue(), //状态
                    ERP_TYPE_CODE = x.TransferFormDocType, //单据类型编码
                    ERP_TYPE_NAME = x.TransferFormDocTypeName, //单据类型名称
                    ERP_STATUS_CODE = x.Status.ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.StatusName, // ERP单据状态名称
                    CREATE_TIME = x.ModifiedOn,//--时间不更新
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_TIME = x.ModifiedOn,
                    UPDATE_USER = UserCode,
                })
                .ToList();
                Logger.Scheduler.Info($"物品转换单据表头信息存入实体中，总数：[{result.Count}]");
                }).ToList();
                Logger.Scheduler.Info($"物品转换单据表头信息存入实体中，总数：[{header.Count}]");
                foreach (var item in listLine)
                {
                    var org = db.Queryable<mes_TransferForm>().Where(x => x.TransferFormId == listLine.First().TransferFormId).First();
                    var order = header.Where(x => x.ID == item.TransferFormId.ToString()).First();
                    BIZ_ITEM_CVT_DTL info = new()
                    {
                        ORDER_NO = item.TransferFormId.ToString(),  //转变单号 ---形态转换单头id
                        ID = item.TransferFormLineId.ToString(),
                        AUTH_ORG = order.AUTH_ORG, //组织
                        ORDER_NO = order.ORDER_NO,  //转变单号 ---形态转换单头id
                        ORDER_LINE = item.DocLineNo.ToString(), //转变单行号
                        STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //状态
                        ITEM_CODE_BF= item.ItemCode, //原物料编码
                        ITEM_NAME_BF = item.ItemName,//原物料名称
                       // ITEM_CODE_AF,//转变后物料编码
                        //ITEM_NAME_AF,//转变后物料名称
                        QTY = item.StoreUOMQty,// 转变数量
                        ERP_TYPE_CODE =item.TransferFormType.ToString(), //ERP转变类型
                        ERP_TYPE_NAME = item.TransferFormTypeName,//ERP转变名称
                        //STORE_UNIT,//库存单位
                        //STORE_UNIT_QTY,//库存单位数量
                        STORE_UNIT = item.StoreUOM,//库存单位
                        STORE_UNIT_QTY = item.StoreUOMQty,//库存单位数量
                        COST_UNIT = item.CostUOM,//成本单位
                        COST_UNIT_QTY = item.CostUOMQty,//成本数量
                        WH_CODE = item.WhCode,//  存储地点
                        WH_NAME = item.WhName,  //  存储地点名称
                        //LOCATION_CODE = item.WhCode,//储位编码
                        LOCATION_CODE = item.BinCode,//储位编码
                        LOTNO = item.LotInfo_LotCode,//批次号
                        AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //组织
                        CREATE_TIME = item.ModifiedOn,//--时间不更新
                        CREATE_USER = UserCode,
                        UPDATE_TIME = item.ModifiedOn,
                        UPDATE_USER = UserCode,
                    };
                    resultDt.Add(info);
                    detail.Add(info);
                }
                Logger.Scheduler.Info($"物品转换单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                Logger.Scheduler.Info($"物品转换单据明细行信息存入实体中，总数：[{detail.Count}]");
                db = Biz.Db;
                if (result.Any())
                if (header.Any())
                {
                    db.Utilities.PageEach(result, 100, pageList =>
                    db.Utilities.PageEach(header, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.ORDER_DATE,q.STATUS, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME,q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.HANDLED, q.HANDLED_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_DATE, q.STATUS, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }

                if (resultDt.Any())
                if (detail.Any())
                {
                    db.Utilities.PageEach(resultDt, 100, pageList =>
                    db.Utilities.PageEach(detail, 100, pageList =>
                    {
                        var y = db.Storageable(pageList, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.ORDER_LINE, t.GHOST_ROW })
                               .ToStorage();
                        y.AsInsertable.ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE_BF, q.ITEM_NAME_BF, q.QTY,q.ERP_TYPE_CODE,q.ERP_TYPE_NAME, q.COST_UNIT, q.COST_UNIT_QTY, q.WH_CODE, q.WH_NAME, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                        y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE_BF, q.ITEM_NAME_BF, q.QTY, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME, q.STORE_UNIT, q.STORE_UNIT_QTY, q.COST_UNIT, q.COST_UNIT_QTY, q.WH_CODE, q.WH_NAME,q.LOCATION_CODE, q.LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                    });
                }
                Logger.Scheduler.Info($"物品转换单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"物品转换单据表头信息存入数据库，总数：[{resultDt.Count}]";
                Logger.Scheduler.Info($"物品转换单据表头信息存入数据库，总数：[{detail.Count}]");
                action.Message = $"物品转换单据表头信息存入数据库，总数：[{detail.Count}]";
            }
            return action;
        }