优化了一些已知问题

Rodney Chen

2025-03-19 422ca5b2fb6f9270ae0067a1c0dc9a02b84b9d67

 Tiger.Business.WMS/ERP/U9C_WMS.cs

@@ -14,6 +14,7 @@
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
using static IronPython.Modules.PythonDateTime;
using System.Net;
using static IronPython.Modules._ast;

namespace Tiger.Business.WMS
{
@@ -41,7 +42,7 @@
                    item.Segment5 = barcode.ItemCode;
                    item.PROD_DATE = barcode.DateCode.ToDateTime();
                    item.Unit = barcode.Unit;
                    item.LotNo= barcode.LotNo;
                    item.LotNo= barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
                }

                //保存到数据库
@@ -239,7 +240,7 @@
        }

        /// <summary>
        /// 同步收货单Asn信息
        /// 同步收货单信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -349,7 +350,7 @@


        /// <summary>
        /// 同步退货单Asn信息
        /// 同步退货单信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -457,5 +458,259 @@
        }


        /// <summary>
        /// 同步获取杂收单据信息   
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public ApiAction In_GetMiscRcvTrans(U9C_Base_Input input)
        {
            var action = new ApiAction();
            Logger.Scheduler.Info($"杂收单据信息开始同步。。。数据检查进行中。。。");
            Logger.Scheduler.Info($"{input.triggerDetail}");
            DbClient db = Biz.DataSource["YadaU9C"].Client;
            string UserCode = "U9C_In_GetMiscRcvTrans";
            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();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_U9_MISC_IN
                {
                    ORDER_NO = x.Key.DocNo,   //单据号
                    STATUS = BIZ_U9_MISC_IN.STATUSs.Init.GetValue(), //状态
                    TYPE_CODE =x.Max(t =>t.MiscRcvDocType), //单据类型编码
                    TYPE_NAME= x.Max(t => t.MiscRcvDocTypeName), //单据类型名称
                    ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP单据状态名称
                    ORDER_DATE = x.Max(t => t.ModifiedOn), //单据日期
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                  // RECEIVER  收货人
                  //RECEIVE_DATE  收货日期
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //组织
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_USER = UserCode,
                    HANDLED = -1, //-1:未处理，0:同步处理完，>0:同步处理失败次数
                    HANDLED_DATE = DateTime.Now, //最后一次同步处理日期
                })
                .ToList();
                Logger.Scheduler.Info($"杂收单据表头信息存入实体中，总数：[{result.Count}]");
                foreach (var item in listLine)
                {
                    var org = db.Queryable<mes_MiscRcvTrans>().Where(x => x.MiscRcvTransID == listLine.First().MiscRcvTransID).First();
                    BIZ_U9_MISC_IN_DTL info = new()
                    {
                        ORDER_NO = item.DocNo,  //单据号
                        LINE_NO = item.DocLineNo.ToString(), //单据行号
                        STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //状态
                        ITEM_CODE = item.ItemCode, //物料编码
                        UNIT = item.StoreUOM,// UNIT 单位  -------待确认
                        QTY = item.StoreUOMQty,//QTY 单据数量-----待确认
                        UNIT_COST = item. CostUOM,   // 成本单位  
                        QTY_GIFT = item.CostUOMQty,   //  成本数量
                        COST_PRICE =item.CostPrice, //   单价
                        COST_MNY = item.CostMny, //  成本
                        WH_CODE = item.WhCode,//  存储地点
                        WH_NAME = item.WhName,  //  存储地点名称
                        BNF_DEPT_CODE = item.BenefitDept,//  受益部门编码
                        BNF_DEPT_NAME = item.BenefitDeptName,  // 收益部门名称
                        // ERP_CODE ERP编码 
                        RETURN_REASON = item.ReturnStorageReason,//  退料原因 
                        INSTORE_REASON = item.InStorageReason,  // INSTORE_REASON 入库原因
                        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);
                }
                Logger.Scheduler.Info($"杂收单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                db = Biz.Db;
                if (result.Any())
                {
                    if (result.Count > 100)
                    {
                        db.Utilities.PageEach(result, 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.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME,q.UPDATE_USER,q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
                        });
                    }
                    else
                    {
                        var s = db.Storageable(result, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns( q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
                    }
                }

                if (resultDt.Any())
                {
                    if (resultDt.Count > 100)
                    {
                        db.Utilities.PageEach(resultDt, 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.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME ,q.BNF_DEPT_CODE ,q.BNF_DEPT_NAME,q.RETURN_REASON ,q.INSTORE_REASON,q.AUTH_ORG ,q.CREATE_USER,q.UPDATE_TIME,q.UPDATE_USER }).ExecuteCommand();
                        });
                    }
                    else
                    {
                        var s = db.Storageable(resultDt, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY,q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    }
                }
                Logger.Scheduler.Info($"杂收单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"杂收单据表头信息存入数据库，总数：[{resultDt.Count}]";
            }
            return action;
        }

        /// <summary>
        /// 同步获取杂发单据信息  
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public ApiAction In_GetMiscShip(U9C_Base_Input input)
        {
            var action = new ApiAction();
            Logger.Scheduler.Info($"杂发单据信息开始同步。。。数据检查进行中。。。");
            Logger.Scheduler.Info($"{input.triggerDetail}");
            DbClient db = Biz.DataSource["YadaU9C"].Client;
            string UserCode = "U9C_In_GetMiscShip";
            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();
            if (list != null && list.Count > 0)
            {
                result = list
                .GroupBy(x => new { x.DocNo })
                .Select(x => new BIZ_U9_MISC_OUT
                {
                    ORDER_NO = x.Key.DocNo,   //单据号
                    STATUS = BIZ_U9_MISC_OUT.STATUSs.Init.GetValue(), //状态
                    TYPE_CODE = x.Max(t => t.MiscShipDocType), //单据类型编码
                    TYPE_NAME = x.Max(t => t.MiscShipDocTypeName), //单据类型名称
                    ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP单据状态名称
                    ORDER_DATE = x.Max(t => t.BusinessDate), //单据日期 ---待确认
 /*                    PREP_PERSON      //备料人
                   FINISH_TIME  //备料完成时间 
                   REQ_PERSON //领料人
                   REQ_DEPT  //领料部门
                   DLVY_TIME //出库时间*/
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                    AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //组织
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_USER = UserCode,
                    HANDLED = -1, //-1:未处理，0:同步处理完，>0:同步处理失败次数
                    HANDLED_DATE = DateTime.Now, //最后一次同步处理日期
                    // COMMIT_JSON 过账提交的JSON
                  //COMMIT_MSG  过账提交的返回信息
                })
                .ToList();
                Logger.Scheduler.Info($"杂发单据表头信息存入实体中，总数：[{result.Count}]");
                foreach (var item in listLine)
                {
                    var org = db.Queryable<mes_MiscShip>().Where(x => x.MiscShipID == listLine.First().MiscShipID).First();
                    BIZ_U9_MISC_OUT_DTL info = new()
                    {
                        ORDER_NO = item.DocNo,  //单据号
                        LINE_NO = item.DocLineNo.ToString(), //单据行号
                        STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //状态
                        ITEM_CODE = item.ItemCode, //物料编码
                       UNIT =item.StoreUOM,// UNIT 单位  -------待确认
                       QTY = item.StoreUOMQty,//QTY 单据数量-----待确认
                        UNIT_COST = item.CostUOM,   // 成本单位  
                        QTY_GIFT = item.CostUOMQty,   //  成本数量
                        COST_PRICE = item.CostPrice, //   单价
                        COST_MNY = item.CostMny, //  成本
                        WH_CODE = item.WhCode,//  存储地点
                        WH_NAME = item.WhName,  //  存储地点名称
                        BNF_DEPT_CODE = item.BenefitDept,//  受益部门编码
                        BNF_DEPT_NAME = item.BenefitDeptName,  // 收益部门名称
                        // ERP_CODE ERP编码 
                        OUTSTORE_REASON = item.OutStorageReason,  // OUTSTORE_REASON 出库原因

                        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);
                }
                Logger.Scheduler.Info($"杂发单据明细行信息存入实体中，总数：[{resultDt.Count}]");
                db = Biz.Db;
                if (result.Any())
                {
                    if (result.Count > 100)
                    {
                        db.Utilities.PageEach(result, 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.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
                        });
                    }
                    else
                    {
                        var s = db.Storageable(result, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
                    }
                }

                if (resultDt.Any())
                {
                    if (resultDt.Count > 100)
                    {
                        db.Utilities.PageEach(resultDt, 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.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                        });
                    }
                    else
                    {
                        var s = db.Storageable(resultDt, UserCode)
                               .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    }
                }
                Logger.Scheduler.Info($"杂发单据表头信息存入数据库，总数：[{resultDt.Count}]");
                action.Message = $"杂发单据表头信息存入数据库，总数：[{resultDt.Count}]";
            }
            return action;
        }
    }
}