TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -129,7 +129,8 @@
			ID = dtl.LineID.ToString(),
			ITEM_CODE = dtl.ItemCode,
			QTY_PACKING = dtl.PackQty.ToDouble(),
			QTY = dtl.POQtyTU.ToDouble(),
			QTY = dtl.ShipQtyTU.ToDouble(),
			PO_QTY = dtl.POQtyTU,
			SUPP_CODE = dtl.SupplierCode,
			SUPP_LOTNO = dtl.SupplierLot,
			LOTNO = dtl.LotMater,
			@@ -223,7 +224,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.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
			});
			}
			if (dtls.Any())
			@@ -234,7 +235,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.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.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
			});
			}
			if (sns.Any())
			@@ -328,11 +329,11 @@
			{
			BIZ_U9_RECEIPT_DTL info = new()
			{
			STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //状态
			STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //状态
			ORDER_NO = item.DocNo, //单据号
			LINE_NO = item.DocLineNo.ToString(), //单据行号
			ITEM_CODE = item.ItemCode, //物料编码
			QTY = item.RtnFillQtyTU.ToDouble(), // mes单据数量 --U9退补数量
			QTY = item.EyeballingQtyTU.ToDouble(), // mes单据数量 --U9退补数量
			AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE, //生产单元授权标识字符
			CREATE_TIME = item.ModifiedOn,//--时间不更新
			CREATE_USER = UserCode,
			@@ -387,13 +388,13 @@
			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_RETURN> result = new();
			List<BIZ_U9_RETURN_DTL> resultDt = new();
			List<BIZ_U9_RMA> result = new();
			List<BIZ_U9_RMA_DTL> resultDt = new();
			if (list != null && list.Count > 0)
			{
			result = list
			.GroupBy(x => new { x.DocNo })
			.Select(x => new BIZ_U9_RETURN
			.Select(x => new BIZ_U9_RMA
			{
			STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(), //状态
			ORDER_NO = x.Key.DocNo, //单号
			@@ -413,9 +414,9 @@
			Logger.Scheduler.Info($"退货单表头信息存入实体中，总数：[{result.Count}]");
			foreach (var item in list)
			{
			BIZ_U9_RETURN_DTL info = new()
			BIZ_U9_RMA_DTL info = new()
			{
			STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //状态
			STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //状态
			ORDER_NO = item.DocNo, //单据号
			LINE_NO = item.DocLineNo.ToString(), //单据行号
			ITEM_CODE = item.ItemCode, //物料编码
			@@ -617,7 +618,7 @@
			{
			ORDER_NO = item.DocNo, //单据号
			LINE_NO = item.DocLineNo.ToString(), //单据行号
			STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //状态
			STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //状态
			ITEM_CODE = item.ItemCode, //物料编码
			UNIT =item.StoreUOM,// UNIT 单位
			QTY = item.StoreUOMQty,//QTY 单据数量