修改打印功能

Admin.Core.Api/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -431,11 +436,21 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
             <summary>
             订单号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialBarcode">
             <summary>
             条码
@@ -461,11 +476,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +491,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2436,76 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductCode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.StandardAmount">
+            <summary>
+            物料数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.Api/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -461,11 +466,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +481,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2426,56 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -431,11 +436,21 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
             <summary>
             订单号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialBarcode">
             <summary>
             条码
@@ -461,11 +476,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +491,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2436,76 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductCode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.StandardAmount">
+            <summary>
+            物料数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -431,11 +436,21 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
             <summary>
             订单号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialBarcode">
             <summary>
             条码
@@ -461,11 +476,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +491,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2436,76 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductCode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.StandardAmount">
+            <summary>
+            物料数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs

@@ -1,6 +1,9 @@
 using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.Model_New;
+using Admin.Core.Model.ViewModels;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Admin.Core.IRepository
 {
@@ -9,5 +12,6 @@ namespace Admin.Core.IRepository
     /// </summary>	
     public interface IBaseOrderInfoServices : IBaseServices<BaseOrderInfo>
     {
+        Task<List<PrintPlanInfoView>> QueryPrintInfo();
     }
 }

Admin.Core.IService/IService_New/IProductPlanInfoServices.cs

@@ -16,10 +16,6 @@ namespace Admin.Core.IService
 		/// </summary>
 		/// <returns></returns>
         Task<List<PlanMaintenanceView>> QueryPlanInfo();
-        /// <summary>
-        /// 打印获取数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<PlanMaintenanceView>> QueryPrintInfo();
+     
     }
 }

Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -431,11 +436,21 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
             <summary>
             订单号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialBarcode">
             <summary>
             条码
@@ -461,11 +476,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +491,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2436,76 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductCode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.StandardAmount">
+            <summary>
+            物料数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.Model/Model_New/BaseBomInfo.cs

@@ -7,6 +7,9 @@ using System.Threading.Tasks;
 
 namespace Admin.Core.Model
 {
+    /// <summary>
+    /// SAP BOM
+    /// </summary>
     [SugarTable("BASE_BOMINFO", "AUCMA_MES")]
     public class BaseBomInfo
     {

Admin.Core.Model/Model_New/PrintBarCode.cs

@@ -22,8 +22,18 @@ namespace Admin.Core.Model.Model_New
         /// <summary>
         /// 订单号
         /// </summary>
-        [SugarColumn(ColumnName = "ORDER_CODE")]
-        public string OrderCode { get; set; }
+        [SugarColumn(ColumnName = "PRODUCT_CODE")]
+        public string ProductCode { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string MaterialCode { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_NAME")]
+        public string MaterialName { get; set; }
         /// <summary>
         /// 条码
         /// </summary>

Admin.Core.Model/Model_New/PrintOrderInfo.cs

@@ -20,12 +20,6 @@ namespace Admin.Core.Model.Model_New
         [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
         public int ObjId { get; set; }
 
-        /// <summary>
-        /// 计划编号
-        /// </summary>
-        [SugarColumn(ColumnName = "PLAN_CODE")]
-        public string PlanCode { get; set; }
-
         /// <summary>
         /// 工单编号
         /// </summary>
@@ -45,21 +39,21 @@ namespace Admin.Core.Model.Model_New
         public string MaterialName { get; set; }
 
         /// <summary>
-        /// 已打印数量
+        /// 内胆已打印数量
         /// </summary>
-        [SugarColumn(ColumnName = "PRINT_AMOUNT")]
-        public int PrintAmount { get; set; }
+        [SugarColumn(ColumnName = "LINER_AMOUNT")]
+        public int LinerAmount { get; set; }
 
         /// <summary>
-        /// 补打数量
+        /// 箱壳已打印数量
         /// </summary>
-        [SugarColumn(ColumnName = "SUPPLEMENT_AMOUNT")]
-        public int SupplementAmount { get; set; }
+        [SugarColumn(ColumnName = "BOX_AMOUNT")]
+        public int BoxAmount { get; set; }
 
         /// <summary>
-        /// 续打数量
+        /// 创建时间
         /// </summary>
-        [SugarColumn(ColumnName = "CONTINUED_AMOUNT")]
-        public int ContinuedAmount { get; set; }
+        [SugarColumn(ColumnName = "CREATE_TIME")]
+        public DateTime CreateTime { get; set; }
     }
 }

Admin.Core.Model/ViewModels/PrintPlanInfoView.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.Core.Model.ViewModels
+{
+    /// <summary>
+    /// 条码打印物料信息
+    /// </summary>
+    public  class PrintPlanInfoView
+    {
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public string OrderCode { get; set; }
+        /// <summary>
+        /// 产品编号
+        /// </summary>
+        public string ProductCode { get; set; }
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string ProductName { get; set; }
+        /// <summary>
+        /// 订单量
+        /// </summary>
+        public int PlanAmount { get; set; }
+        /// <summary>
+        /// 完成量
+        /// </summary>
+        public int CompleteAmount { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialCode { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 物料数量
+        /// </summary>
+        public int StandardAmount { get; set; }
+        /// <summary>
+        /// 异常量
+        /// </summary>
+        public int ErrorAmount { get; set; }
+        /// <summary>
+        /// 内胆码已打量
+        /// </summary>
+        public int LinerAmount { get; set; }
+        /// <summary>
+        /// 箱壳码已打量
+        /// </summary>
+        public int BoxAmount { get; set; }
+        /// <summary>
+        /// 剩余数量
+        /// </summary>
+        public int ResidueAmount { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+    }
+}

Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -431,11 +436,21 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.OrderCode">
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.ProductCode">
             <summary>
             订单号
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintBarCode.MaterialBarcode">
             <summary>
             条码
@@ -461,11 +476,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +491,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2436,76 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductCode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductName">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.StandardAmount">
+            <summary>
+            物料数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号

Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-74de3d37b2e37bf34385321c9f2ee57db1ed38e7
+14f3c0cc99723997ecc1382bc0b4c8bbdca8d95a

Admin.Core.RealTimeService/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -221,6 +221,11 @@
             唯一标识
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseBomInfo">
+            <summary>
+            SAP BOM
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
              <summary>
              主键标识 
@@ -461,11 +466,6 @@
             主键
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PlanCode">
-            <summary>
-            计划编号
-            </summary>
-        </member>
         <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.OrderCode">
             <summary>
             工单编号
@@ -481,19 +481,19 @@
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.PrintAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.LinerAmount">
             <summary>
-            已打印数量
+            内胆已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.SupplementAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.BoxAmount">
             <summary>
-            补打数量
+            箱壳已打印数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.ContinuedAmount">
+        <member name="P:Admin.Core.Model.Model_New.PrintOrderInfo.CreateTime">
             <summary>
-            续打数量
+            创建时间
             </summary>
         </member>
         <member name="T:Admin.Core.Model.Model_New.ProductOrderInfo">
@@ -2426,6 +2426,56 @@
             Dto
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.ViewModels.PrintPlanInfoView">
+            <summary>
+            条码打印物料信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.OrderCode">
+            <summary>
+            订单编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialCode">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
+            <summary>
+            订单量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.CompleteAmount">
+            <summary>
+            完成量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ErrorAmount">
+            <summary>
+            异常量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.LinerAmount">
+            <summary>
+            内胆码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.BoxAmount">
+            <summary>
+            箱壳码已打量
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ResidueAmount">
+            <summary>
+            剩余数量
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.PlanMaintenanceView.No">
             <summary>
             序号