Tiger.Business.WMS/ERP/U9C_WMS.cs

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

namespace Tiger.Business.WMS
{
    public partial class U9C_WMS: IU9C_WMS
    public partial class U9C_WMS : IU9C_WMS
    {
        /// <summary>
        /// 同步物料条码信息
@@ -37,7 +36,7 @@
                    item.Segment5 = barcode.ItemCode;
                    item.PROD_DATE = barcode.DateCode.ToDateTime();
                    item.Unit = barcode.Unit;
                    item.LotNo= barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
                    item.LotNo = barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
                }

                //保存到数据库
@@ -79,7 +78,7 @@
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public ApiAction In_DocASN(U9C_Base_Input input) 
        public ApiAction In_DocASN(U9C_Base_Input input)
        {
            var action = new ApiAction();
            Logger.Scheduler.Info($"送货单Asn信息开始同步。。。数据检查进行中。。。");
@@ -96,7 +95,7 @@
            List<WMS_ITEM_EXT> itemExts = new();
            List<WMS_ITEM_PKG> pkgs = new();

            if (list != null && list.Count > 0) 
            if (list != null && list.Count > 0)
            {
                asns = list
                .GroupBy(x => new { x.DocNo })
@@ -112,7 +111,7 @@
                    PLANARRIVED_DATE = x.Max(t => t.PlanArriveDate),
                    ORDER_DATE = x.Max(t => t.ModifiedOn),
                    CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--时间不更新
                    CREATE_USER= UserCode,
                    CREATE_USER = UserCode,
                    UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
                    UPDATE_USER = UserCode,
                })
@@ -145,7 +144,7 @@
                foreach (var asn in asns)
                {
                    var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
              

                    foreach (var sn in snlist)
                    {
                        var barcode = new Barcode(sn.Code);
@@ -178,7 +177,7 @@
                                AUTH_ORG = asn.AUTH_ORG,
                                STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
                                QTY = sn.WhQty,
                                PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ??DateTime.Now,
                                PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ?? DateTime.Now,
                                UNIT = barcode.Unit,
                                TRANS_CODE = nameof(BIZ_U9_ASN),
                                TRANS_NO = info.ORDER_NO,
@@ -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())
@@ -301,13 +300,13 @@
            Logger.Scheduler.Info($"{input.triggerDetail}");
            DbClient db = Biz.DataSource["YadaU9C"].Client;
            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 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,18 +470,18 @@
            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, //组织
                    ORDER_NO = x.DocNo,   //单据号
                    STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //状态
                    TYPE_CODE =x.MiscRcvDocType, //单据类型编码
                    TYPE_NAME= x.MiscRcvDocTypeName, //单据类型名称
                    TYPE_CODE = x.MiscRcvDocType, //单据类型编码
                    TYPE_NAME = x.MiscRcvDocTypeName, //单据类型名称
                    ERP_STATUS_CODE = x.Status.ToString(), // ERP单据状态
                    ERP_STATUS_NAME = x.StatusName, // ERP单据状态名称
                    ORDER_DATE = x.BusinessDate, //单据日期
@@ -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(),
@@ -508,9 +504,9 @@
                        ITEM_CODE = item.ItemCode, //物料编码
                        UNIT = item.StoreUOM,// UNIT 单位  
                        QTY = item.StoreUOMQty,//QTY 单据数量
                        UNIT_COST = item. CostUOM,   // 成本单位  
                        UNIT_COST = item.CostUOM,   // 成本单位  
                        QTY_COST = item.CostUOMQty,   //  成本数量
                        COST_PRICE =item.CostPrice, //   单价
                        COST_PRICE = item.CostPrice, //   单价
                        COST_MNY = item.CostMny, //  成本
                        WH_CODE = item.WhCode,//  存储地点
                        WH_NAME = item.WhName,  //  存储地点名称
@@ -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  过账提交的返回信息
                    ORDER_DATE = x.Max(t => t.CreatedOn), //单据日期 ---创建日期
                    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;
        }
@@ -880,95 +849,87 @@
            Logger.Scheduler.Info($"{input.triggerDetail}");
            DbClient db = Biz.DataSource["YadaU9C"].Client;
            string UserCode = "U9C_In_GetTransfer";
           var list = db.Queryable<mes_TransferForm>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
            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_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_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;
        }

 Tiger.Business.WMS/ERP/WMS_U9C.cs

@@ -85,7 +85,7 @@
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货单-来源ASN单失败:{result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货单-来源ASN单失败，提交Json: {JsonConvert.SerializeObject(param)}，错误信息:{result.Data[0].ErrorMsg}");
                    }
                }
            }
@@ -118,37 +118,27 @@
                        Logger.Interface.Info($"U9C登录token: {input.token}");
                    }
                }
                CreateReceivementParam param = new()
                {
                    rcvDTO = new()
                    {
                        BusinessDate = DateTime.Now,
                        Supplier = new() { m_code = input.Supplier },
                        RcvDocType = new() { m_code = input.RcvDocType },
                        RcvLines= input.RcvLines,
                    },
                    OtherID = "WMS"
                };
                var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });

                var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(input.CreateReceivementParam), new Dictionary<string, string>() { { "token", input.token } });
                var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data[0].IsSucess)
                    {
                        action.Data = result.Data;
                        Logger.Interface.Info($"新增收货单-无来源接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
                        Logger.Interface.Info($"新增收货单-无来源接口提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}，返回Json: {response.Message}");
                    }
                    else
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货-单无来源失败:{result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货-单无来源失败，提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}，错误信息:{result.Data[0].ErrorMsg}");
                    }
                }
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, "新增收货单-无来源异常");
                action.CatchExceptionWithLog(ex, $"新增收货单-无来源异常，提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}");
            }
            Logger.Interface.Info($"/* 新增收货单-无来源接口结束 */\r\n"); //固定写法
            return action;

 Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs

@@ -41,7 +41,6 @@
        private BIZ_U9_ASN order = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        List<string> SnList = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion

        #region Functions
@@ -61,18 +60,24 @@
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //如果是未上门户
                else if (input.Data == "0")
                else if (input.Command == "NotOn")
                {
                    action = await GetAsnInfoForPrint(input);
                }
                //如果是随单赠品或者样品
                else if (input.Data == "1")
                else if (input.Command == "IsGift")
                {

                    action = await GetAsnInfoBySn(input);
                }
                else if (input.Data == "Submit")
                //如果是未上门户提交
                else if (input.Command == "Submit")
                {
                    action = await Submit(input);
                }
                //如果是随单赠品或者样品提交
                else if (input.Command == "GenerateASN")
                {
                    action = await GenerateASN(input);
                }
            }
            catch (Exception ex)
@@ -95,14 +100,121 @@
            var action = new ApiAction<ScanOutput>($"成功获取ASN单[{input.SN}]信息", new ScanOutput());
            try
            {
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (order == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                action.LocaleMsg = order.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN单[{input.SN}]状态为[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]，请继续未完成的操作") : action.LocaleMsg;
                action.Data.Data = order;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 随单赠品扫SN获取ASN单信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        private async Task<ApiAction<ScanOutput>> GetAsnInfoBySn(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
                if (AsnSn == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到条码[{input.SN}]的数据");
                    return action;
                }
                if (CurSn.Count > 0 && CurSn.Any(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"已经存在的批次[{AsnSn.LOTNO}]未完成操作，请先完成此批次");
                    return action;
                }
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (order == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                //如果是第一次扫描，生成单号
                if (CurSn.Count == 0)
                {
                    action.Data.Command = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                }
                CurSn.Add(AsnSn);
                var _order = order.Clone();
                _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
                action.LocaleMsg = Biz.L($"成功获取ASN单[{AsnSn.ORDER_NO}]的信息");
                action.Data.Data = _order;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 赠品/样品提交，需要生成WMS的ASN单
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction<ScanOutput>> GenerateASN(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var reqType = input.Options["reqType"].ToString();
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                BIZ_U9_ASN Asn = new()
                {
                    ID = Guid.NewGuid().ToString("N"),
                    ORDER_NO = dtl.ORDER_NO,
                    STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
                    SUPP_CODE = order.SUPP_CODE,
                    SUPP_NAME = order.SUPP_NAME,
                    DELIVERY_DATE = order.DELIVERY_DATE,
                    PLANARRIVED_DATE = order.PLANARRIVED_DATE,
                    ORDER_DATE = DateTime.Now,
                    CREATE_TIME = DateTime.Now,
                    CREATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    UPDATE_TIME = DateTime.Now,
                    UPDATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    AUTH_ORG = order.AUTH_ORG,
                };
                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _dtl = dtl.Clone();
                _dtl.ID = Guid.NewGuid().ToString("N");
                _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
                _dtl.AUTH_ORG = order.AUTH_ORG;
                input.Options["record"] = _dtl.ToJson();
                var _Asn = Asn.Clone();
                AddCommitAction("GenerateASN", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Insertable(_Asn, UserCode).ExecuteCommand();
                    var y = db.Storageable(_dtl, UserCode).WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW }).ToStorage();
                    y.AsInsertable.ExecuteCommand();
                    y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.STATUS, q.SUPP_CODE, q.SUPP_LOTNO, q.QTY_PACKING, q.QTY_GIFT, q.IS_GIFT, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                });
                action = await Submit(input);
            }
            catch (Exception ex)
            {
@@ -126,12 +238,12 @@
                var snlist = input.Options["Snlist"].ToString().JsonToObject<List<BIZ_U9_ASN_SN>>();
                var reqType = input.Options["reqType"].ToString();
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                action.LocaleMsg = Biz.L($"成功提交ASN单[{dtl.ORDER_NO}]行数据，并完成清点，请点击打印按钮打印标签");
                action.LocaleMsg = Biz.L($"成功提交ASN单[{dtl.ORDER_NO}]行数据，请点击打印按钮打印标签");

                if (MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO && (q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(q => q.QTY) == dtl.QTY)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"ASN单[{dtl.ORDER_NO}]行[{dtl.LINE_NO}]数据已全部清点完成，如果未打印标签请点击打印按钮打印标签");
                    action.LocaleMsg = dtl.ORDER_NO.IsNullOrEmpty() ? Biz.L($"数据不存在！") : Biz.L($"ASN单[{dtl.ORDER_NO}]行[{dtl.LINE_NO}]数据已全部提交完成，如果未打印标签请点击打印按钮打印标签");
                    return action;
                }
                List<BIZ_U9_ASN_SN> sns = new();
@@ -139,6 +251,7 @@
                List<WMS_ITEM_HIS> hiss = new();
                List<WMS_ITEM_EXT> itemExts = new();
                List<WMS_ITEM_PKG> pkgs = new();
                SnList.Clear();
                foreach (var sn in snlist)
                {
                    var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
@@ -164,6 +277,7 @@
                        RECEIVE_DATE = DateTime.Now,
                    };
                    sns.Add(info);

                    var item = new WMS_ITEM()
                    {
                        SN = barcode.SN,
@@ -202,6 +316,11 @@
                        SUPP_LOTNO = dtl.SUPP_LOTNO,
                    };
                    pkgs.Add(pkg);
                }
                //更新当前清点的条码状态
                foreach (var sn in CurSn)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                }

                AddCommitAction("CountedAndPrint", () =>
@@ -264,52 +383,59 @@
                    return action;
                }

                //查询是否清点完成
                //查询是否存在清点完成的行明细，如果有则先提交完成的行，如果没有则报错
                var finishNotSubmit = order.Details.Where(q => SqlFunc.IsNullOrEmpty(q.RECEIVER_NO) && q.QTY == order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY)).ToList();
                var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
                if (noFinish.Any())
                if (!finishNotSubmit.Any())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("送货单[{0}]未清点完成，请先清点完成，未完成清点的行号如下：{1}");
                    //action.LocaleMsg = Biz.L("送货单[{0}]没有清点完成可以提交的行，未完成清点的行号如下：{1}");
                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("，", noFinish.Select(q => q.LINE_NO)));
                    return action;
                }
                ApiAction<List<U9CReturnData2>> result = new();
                //如果是随单赠品或者样品
                if (reqType == "1")
                if (reqType.ToInt32() > 0)
                {
                    var rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
                    var iInput = new CreateReceivementInput
                    {
                        userId = UserCode,
                        IsLogin = true,
                        Supplier = "",
                        RcvDocType = "",
                        RcvLines = new()
                        CreateReceivementParam = new()
                        {
                            rcvDTO = new()
                            {
                                new(){
                                    ItemInfo = new(){m_itemCode="" },
                                    Wh= new(){ m_code=""},
                                Supplier = new() { m_code = order.SUPP_CODE },
                                RcvDocType = new() { m_code = rcvDocType },
                                RcvLines = finishNotSubmit.Select(q=> new RcvLine
                                {
                                    ItemInfo = new() { m_itemCode = q.ITEM_CODE},
                                    Wh = new() { m_code = "10101" },
                                    RcvLineLocations = new(){
                                        new(){
                                            Location = new(){ m_code="" },
                                            LocationQtyTU = 0,
                                        }
                                    },
                                    ArriveQtyTU = 0,
                                    ArriveQtyPU = 0,
                                    RcvQtyTU= 0,
                                    RcvQtyPU= 0,
                                    EyeballingQtyTU = 0,
                                            new(){
                                                Location = new(){ m_code= q.ItemInfo.DEFAULT_LOCATION},
                                                LocationQtyTU = q.QTY,
                                            }
                                        },
                                    ArriveQtyTU = q.QTY,
                                    ArriveQtyPU = q.QTY,
                                    RcvQtyTU = 0,
                                    RcvQtyPU = 0,
                                    EyeballingQtyTU = q.QTY,
                                    RcvProcedure = 0,
                                    StorageType = 0,
                                    RcvLotCode = "",
                                    InvLotCode  = "",
                                },
                                    RcvLotCode = rcvDocType == "RCV03" ? $"{DateTime.Now.ToString("yyyyMMdd")}" : "",
                                    InvLotCode = rcvDocType == "RCV03"? $"{DateTime.Now.ToString("yyyyMMdd")}": q.LOTNO,
                                }).ToList(),
                            }
                        },
                    };
                    result = await DI.Resolve<IWMS_U9C>().CreateReceivement(iInput);
                    if (!result.IsSuccessed)
                    {
                        throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
                        action.IsSuccessed = false;
                        action.LocaleMsg = result.LocaleMsg;
                        return action;
                    }
                }
                //如果是未上门户
@@ -318,10 +444,10 @@
                    var iInput = new CreateRcvBySrcASNInput
                    {
                        userId = UserCode,
                        IsLogin = true,
                        IsLogin = false, // true,
                        CreateRcvBySrcASNParam = new()
                        {
                            aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
                            aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
                            {
                                ASNLineKey = q.ID,
                                TransQty = new() { m_amount1 = q.QTY },
@@ -332,7 +458,9 @@
                    result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
                    if (!result.IsSuccessed)
                    {
                        throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
                        action.IsSuccessed = false;
                        action.LocaleMsg = result.LocaleMsg;
                        return action;
                    }
                }

@@ -361,7 +489,7 @@

                    foreach (var item in list)
                    {
                        var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        BIZ_U9_RECEIPT_DTL receiptDt = new()
                        {
                            ID = item.RcvLineId.ToString(),
@@ -381,9 +509,15 @@
                            ERP_STATUS_NAME = item.StatusName,
                        };
                        receipt.Details.Add(receiptDt);
                        asnDtl.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                        asnDtl.RECEIVER_ID = item.RcvId.ToString();
                        asnDtl.RECEIVER_NO = item.DocNo;
                        asnDtl.RECEIVER_LINE = item.DocLineNo.ToString();
                        asnDtl.RECEIVER = UserCode;
                        asnDtl.RECEIVE_DATE = DateTime.Now;
                    }

                    foreach (var sn in order.SnList)
                    foreach (var sn in order.SnList.Where(q => finishNotSubmit.Any(s => s.LINE_NO == q.LINE_NO)))
                    {
                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                        BIZ_U9_RECEIPT_SN receiptSn = new()
@@ -408,7 +542,7 @@
                }

                //更新库存表信息
                var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
                var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                var historys = new List<WMS_ITEM_HIS>();
                foreach (var item in items)
                {
@@ -422,7 +556,7 @@
                    item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
                    historys.Add(new WMS_ITEM_HIS(item, $"送货单[{order.ORDER_NO}]的条码[{item.SN}]生成收货单[{receipt.ORDER_NO}]，待检验完成后可入库"));
                }
                var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
                var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                foreach (var item in pkgs)
                {
                    item.AUTH_ORG = receipt.AUTH_ORG;
@@ -433,11 +567,13 @@
                    item.TRANS_NO = receipt.ORDER_NO;
                    item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
                }
                order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                order.RECEIVER_ID = receipt.ID;
                order.RECEIVER_NO = receipt.ORDER_NO;
                order.RECEIVER = UserCode;
                order.RECEIVE_DATE = DateTime.Now;

                if (!noFinish.Any())
                {
                    order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                    order.RECEIVER = UserCode;
                    order.RECEIVE_DATE = DateTime.Now;
                }

                //使用统一的事务DB对象
                var db = GetCommitDB();
@@ -446,7 +582,8 @@
                    db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
                    db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
                    db.Insertable(historys, UserCode).ExecuteCommand();
                    db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
                    db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE }).ExecuteCommand();
                    db.Updateable(finishNotSubmit, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO, q.RECEIVER_LINE }).ExecuteCommand();
                    db.Insertable(receipt, UserCode).ExecuteCommand();
                    db.Insertable(receipt.Details, UserCode).ExecuteCommand();
                    db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
@@ -455,6 +592,7 @@
                {
                    //action.LocaleMsg = Biz.L($"送货单[{0}]生成收货单[{1}]成功");
                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
                    CurSn.Clear();
                }
                else
                {
@@ -489,7 +627,7 @@
            action.Data.Data = SnList;

            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功！");
            action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
            //action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));

            //重置工序
            ResetTrans();
@@ -507,7 +645,8 @@
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
            CurSn = null;
            //CurSn = null;
            SnList = new();
        }

        public override bool Close(bool needSaveHistoryLog = false)

 Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs

@@ -54,6 +54,11 @@
        public bool IsLogin { get; set; }
    }

    public class Mcode
    {
        public string m_code { get; set; }
    }

    public class IssueUOM : BaseCode { }

    public class POLine : BaseCode
@@ -295,11 +300,9 @@
    public class CreateReceivementInput : U9CBaseInput
    {
        /// <summary>
        /// 供应商
        /// 无来源参数
        /// </summary>
        public string Supplier { get; set; }
        public string RcvDocType { get; set; }
        public List<RcvLine> RcvLines { get; set; }
        public CreateReceivementParam CreateReceivementParam { get; set; }
    }

    public class RcvDTO
@@ -311,11 +314,11 @@
        /// <summary>
        /// 供应商
        /// </summary>
        public Supplier Supplier { get; set; }
        public Mcode Supplier { get; set; }
        /// <summary>
        /// 单据类型：有ASN单传RCV01，没有ASN单赠品传RCV03
        /// </summary>
        public RcvDocType RcvDocType { get; set; }
        public Mcode RcvDocType { get; set; }
        public List<RcvLine> RcvLines { get; set; }
        public bool IsRcvByChangeable { get; set; } = true;
        public bool IsPriceListChangeable { get; set; } = true;
@@ -323,14 +326,7 @@
        public bool IsPaymentTermChangeable { get; set; } = true;
        public bool IsLineApprove { get; set; } = true;
    }
    public class Supplier
    {
        public string m_code { get; set; }
    }
    public class RcvDocType
    {
        public string m_code { get; set; }
    }

    public class RcvLine
    {
        /// <summary>
@@ -382,13 +378,11 @@
    {
        public string m_itemCode { get; set; }
    }
    public class Wh2
    public class Wh2: Mcode
    {
        public string m_code { get; set; }
    }
    public class Location
    public class Location : Mcode
    {
        public string m_code { get; set; }
    }

    public class RcvLineLocation

 Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT.cs

@@ -7,159 +7,149 @@
namespace Tiger.Model
{
    /// <summary>
    /// 实体：委外发料单(U9)
    /// 实体：委外发料单(U9)
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("委外发料单(U9)")]
    [DisplayName("委外发料单(U9)")]
    [Serializable]
    [SugarTable("BIZ_U9_SCM_OUT")]
    public class BIZ_U9_SCM_OUT : DbEntityWithAuth
    {
        #region 构造函数
        #region 构造函数
        /// <summary>
        /// 实体：委外发料单(U9)
        /// 实体：委外发料单(U9)
        /// </summary>
        public BIZ_U9_SCM_OUT() {}
        #endregion

        #region 公共属性
        #region 公共属性
        /// <summary>
        /// 单据号
        /// 单据号
        /// </summary>
        [DisplayName("单据号")]
        [DisplayName("单据号")]
        public string ORDER_NO { get; set; }
        /// <summary>
        /// 状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
        /// 状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
        /// </summary>
        [DisplayName("状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)")]
        [DisplayName("状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)")]
        public int STATUS { get; set; }
        /// <summary>
        /// 单据日期
        /// 单据日期
        /// </summary>
        [DisplayName("单据日期")]
        [DisplayName("单据日期")]
        public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 供应商组织
        /// 供应商组织
        /// </summary>
        [DisplayName("供应商组织")]
        [DisplayName("供应商组织")]
        public string SUPP_ORG { get; set; }
        /// <summary>
        /// 采购单ID
        /// 备料人
        /// </summary>
        [DisplayName("采购单ID")]
        public string PO_ID { get; set; }
        /// <summary>
        /// 采购单号
        /// </summary>
        [DisplayName("采购单号")]
        public string PO_NO { get; set; }
        /// <summary>
        /// 备料人
        /// </summary>
        [DisplayName("备料人")]
        [DisplayName("备料人")]
        public string PREP_PERSON { get; set; }
        /// <summary>
        /// 备料完成时间
        /// 备料完成时间
        /// </summary>
        [DisplayName("备料完成时间")]
        [DisplayName("备料完成时间")]
        public DateTime FINISH_TIME { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 领料人
        /// 领料人
        /// </summary>
        [DisplayName("领料人")]
        [DisplayName("领料人")]
        public string REQ_PERSON { get; set; }
        /// <summary>
        /// 领料部门
        /// 领料部门
        /// </summary>
        [DisplayName("领料部门")]
        [DisplayName("领料部门")]
        public string REQ_DEPT { get; set; }
        /// <summary>
        /// 出库时间
        /// 出库时间
        /// </summary>
        [DisplayName("出库时间")]
        [DisplayName("出库时间")]
        public DateTime DLVY_TIME { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 备注
        /// 备注
        /// </summary>
        [DisplayName("备注")]
        [DisplayName("备注")]
        public string REMARK { get; set; }
        /// <summary>
        /// -1:未处理，0:同步处理完，>0:同步处理失败次数
        /// -1:未处理，0:同步处理完，>0:同步处理失败次数
        /// </summary>
        [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
        [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
        public int HANDLED { get; set; }
        /// <summary>
        /// 最后一次同步处理日期
        /// 最后一次同步处理日期
        /// </summary>
        [DisplayName("最后一次同步处理日期")]
        [DisplayName("最后一次同步处理日期")]
        public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 过账提交的JSON
        /// 过账提交的JSON
        /// </summary>
        [DisplayName("过账提交的JSON")]
        [DisplayName("过账提交的JSON")]
        public string COMMIT_JSON { get; set; }
        /// <summary>
        /// 过账提交的返回信息
        /// 过账提交的返回信息
        /// </summary>
        [DisplayName("过账提交的返回信息")]
        [DisplayName("过账提交的返回信息")]
        public string COMMIT_MSG { get; set; }
        #endregion

        #region 虚拟属性
        /*例子
        #region 虚拟属性
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region 外键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_SCM_OUT类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_SCM_OUTId))]//ClassA表中的BIZ_U9_SCM_OUTId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_SCM_OUTId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        #region 外键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_SCM_OUT类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_SCM_OUTId))]//ClassA表中的BIZ_U9_SCM_OUTId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_SCM_OUTId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

        #region 枚举变量
        /*例子
        #region 枚举变量
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            [Description("枚举描述1")]
            Enum1,
        }
        */

        /// <summary>
        /// 枚举：状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
        /// 枚举：状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
        /// </summary>
        public enum STATUSs
        {
            [Description("初始化")]
            [Description("初始化")]
            Init = 0,
            [Description("待捡料")]
            [Description("待捡料")]
            WaitPick = 1,
            [Description("捡料中")]
            [Description("捡料中")]
            Picking = 2,
            [Description("已捡完")]
            [Description("已捡完")]
            Picked = 3,
            [Description("已发料")]
            [Description("已发料")]
            Sended = 4,
            [Description("已关闭")]
            [Description("已关闭")]
            Close = 5,
            [Description("作废")]
            [Description("作废")]
            Cancel = 6,
        }
        #endregion

        #region 公共方法
        #region 公共方法

        #endregion


 Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs

@@ -63,10 +63,30 @@
        /// </summary>
        [DisplayName("ERP单据号码")]
        public string ERP_ORDER { get; set; }
        /// <summary>
        /// 备注
        /// <summary>
        /// 单据类型编码
        /// </summary>
        [DisplayName("备注")]
        [DisplayName("单据类型编码")]
        public string TYPE_CODE { get; set; }
        /// <summary>
        /// 单据类型名称
        /// </summary>
        [DisplayName("单据类型名称")]
        public string TYPE_NAME { get; set; }
        /// <summary>
        /// ERP单据状态
        /// </summary>
        [DisplayName("ERP单据状态")]
        public string ERP_STATUS_CODE { get; set; }
        /// <summary>
        /// ERP单据状态名称
        /// </summary>
        [DisplayName("ERP单据状态名称")]
        public string ERP_STATUS_NAME { get; set; }
        /// <summary>
        /// 备注
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        /// <summary>
        /// -1:未处理，0:同步处理完，>0:同步处理失败次数

 Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs

@@ -73,10 +73,20 @@
        /// </summary>
        [DisplayName("拨入仓库")]
        public string IN_WH_CODE { get; set; }
        /// <summary>
        /// 拨出批号
        /// <summary>
        /// 调出储位
        /// </summary>
        [DisplayName("拨出批号")]
        [DisplayName("调出储位")]
        public string OUT_LOCATION_CODE { get; set; }
        /// <summary>
        /// 拨入储位
        /// </summary>
        [DisplayName("拨入储位")]
        public string IN_LOCATION_CODE { get; set; }
        /// <summary>
        /// 拨出批号
        /// </summary>
        [DisplayName("拨出批号")]
        public string OUT_LOTNO { get; set; }
        /// <summary>
        /// 拨入批号