~sjz/TLM.git - Gitblit

啊鑫

2024-08-28 d8bbd1bc855990e908fc5df9594fc7b4e4628eed

生产领料单erp推送

已修改23个文件

	MES.Service/bin/Debug/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/bin/Debug/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/bin/Release/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/bin/Release/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/service/Warehouse/MesInvItemOutsManager.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Debug/net8.0/MESApplication.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MESApplication.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MESApplication.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MESApplication.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/MESApplication.xml	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MES.Service.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MES.Service.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MESApplication.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MESApplication.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MESApplication.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MESApplication/bin/Release/net8.0/publish/MESApplication.xml	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/Warehouse/MesInvItemOutsManager.cs

@@ -927,28 +927,33 @@
                item.ItemId + "')";
            var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);

            var xsddh = item.Caa015 ?? "";
            var wzh = item.PositionNo ?? "";
            var qty = ((int)item.Quantity).ToString();
            var erpid = ((int)item.erpId).ToString();
            var id = ((int)item.Id).ToString();
            scllentryList.Add(new
            {
                FMaterialId = item.ItemNo,
                FUnitID = C_ITEM_UNIT,
                FAppQty = item.Quantity,
                FActualQty = item.Quantity,
                FAppQty =  qty,
                FActualQty =  qty,
                FStockId = item.DepotCode,
                FPPBomEntryId = item.erpId,
                F_UNW_Text_xsddh = item.Caa015,
                F_UNW_TEXT_WZH = item.PositionNo,
                F_MES_ENTRYID = item.Id
                FPPBomEntryId = erpid,
                F_UNW_Text_xsddh = xsddh,
                F_UNW_TEXT_WZH = wzh,
                F_MES_ENTRYID = id
            });
        }

        var dataJson = new
        {
            F_MES_ID = mesInvItemOuts.Id,
            FDate = mesInvItemOuts.CreateBy,
            F_MES_ID = mesInvItemOuts.Id.ToString(),
            FDate = DateTime.Now.ToString("yyyy-MM-dd"),
            FPickerId = userName,
            F_UNW_LargeText_BZ = " ",
            F_UNW_KH = " ",
            F_UNW_DDSL = womcaa.Caa012,
            F_UNW_DDSL = womcaa.Caa012.ToString(),
            F_UNW_Text_CZG = userName,
            scllentry = scllentryList
        };

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.xml

@@ -1051,20 +1051,20 @@
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
            获取物料接收信息
                获取物料接收信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
            获取明细菜单
                获取明细菜单
            </summary>
            <param name="query"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
            确认接收
                确认接收
            </summary>
            <param name="query"></param>
            <returns></returns>

 MESApplication/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.xml

@@ -1049,6 +1049,26 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                获取物料接收信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                获取明细菜单
            </summary>
            <param name="query"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                确认接收
            </summary>
            <param name="query"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetList">
            <summary>
                获取所有

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.xml

@@ -1049,6 +1049,26 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                获取物料接收信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                获取明细菜单
            </summary>
            <param name="query"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                确认接收
            </summary>
            <param name="query"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetList">
            <summary>
                获取所有

			@@ -927,28 +927,33 @@
			item.ItemId + "')";
			var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);

			var xsddh = item.Caa015 ?? "";
			var wzh = item.PositionNo ?? "";
			var qty = ((int)item.Quantity).ToString();
			var erpid = ((int)item.erpId).ToString();
			var id = ((int)item.Id).ToString();
			scllentryList.Add(new
			{
			FMaterialId = item.ItemNo,
			FUnitID = C_ITEM_UNIT,
			FAppQty = item.Quantity,
			FActualQty = item.Quantity,
			FAppQty = qty,
			FActualQty = qty,
			FStockId = item.DepotCode,
			FPPBomEntryId = item.erpId,
			F_UNW_Text_xsddh = item.Caa015,
			F_UNW_TEXT_WZH = item.PositionNo,
			F_MES_ENTRYID = item.Id
			FPPBomEntryId = erpid,
			F_UNW_Text_xsddh = xsddh,
			F_UNW_TEXT_WZH = wzh,
			F_MES_ENTRYID = id
			});
			}

			var dataJson = new
			{
			F_MES_ID = mesInvItemOuts.Id,
			FDate = mesInvItemOuts.CreateBy,
			F_MES_ID = mesInvItemOuts.Id.ToString(),
			FDate = DateTime.Now.ToString("yyyy-MM-dd"),
			FPickerId = userName,
			F_UNW_LargeText_BZ = " ",
			F_UNW_KH = " ",
			F_UNW_DDSL = womcaa.Caa012,
			F_UNW_DDSL = womcaa.Caa012.ToString(),
			F_UNW_Text_CZG = userName,
			scllentry = scllentryList
			};

			@@ -1051,20 +1051,20 @@
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			获取物料接收信息
			获取物料接收信息
			</summary>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			获取明细菜单
			获取明细菜单
			</summary>
			<param name="query"></param>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			确认接收
			确认接收
			</summary>
			<param name="query"></param>
			<returns></returns>

			@@ -1049,6 +1049,26 @@
			</summary>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			获取物料接收信息
			</summary>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			获取明细菜单
			</summary>
			<param name="query"></param>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
			<summary>
			确认接收
			</summary>
			<param name="query"></param>
			<returns></returns>
			</member>
			<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetList">
			<summary>
			获取所有