修改单据重复显示问题，增加工单源单id关联

yl

2024-03-29 9c634fd767aec36ef97c3a814bf7a29c67d20ee1

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -956,12 +956,13 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            委外报表记录查询
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -975,12 +976,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            委外报表记录导出
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -990,13 +992,14 @@
            <param name="receivdate">收料时间</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            班组工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1018,13 +1021,14 @@
            <param name="id">报工记录主表id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            班组工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1035,13 +1039,14 @@
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            人员工资明细报表
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1056,13 +1061,14 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            人员工资明细报表导出
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1073,12 +1079,13 @@
            <param name = "rejectstepcode" > 剔除工序(固定薪资工序不参与计算) </param >
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            不良明细报表 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1093,12 +1100,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            不良明细报表导出 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1115,12 +1123,13 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            维修明细报表 
            </summary>
            <param name="wkshopcode">车间编号</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1135,12 +1144,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.MaintenanceDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            维修明细报表导出 
            </summary>
            <param name="wkshopcode">车间编号</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
@@ -1235,13 +1245,14 @@
            <param name="checkid">检验记录ID</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            生产进度报表
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="routecode">工艺路线编码</param>
            <param name="routename">工艺路线名称</param>
            <param name="partcode">产品编码</param>
@@ -1254,13 +1265,14 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            生产进度报表导出
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="routecode">工艺路线编码</param>
            <param name="routename">工艺路线名称</param>
            <param name="partcode">产品编码</param>
@@ -2704,6 +2716,13 @@
            <param name="wo_code">工单编号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.UpdateMesOrderPrintCount(System.String)">
            <summary>
            MES工单打印更新打印次数
            </summary>
            <param name="wo_code">工单编号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepEqpSearch(System.String)">
            <summary>
            生产开报工扫码获取当前工序对应的设备(自制)
@@ -2718,11 +2737,15 @@
            <param name="orderstepqrcode">扫描的二维码信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            生产开报工扫码获取工单对应工序任务(自制)
            </summary>
            <param name="orderstepqrcode">扫描的二维码信息</param>
            <param name="wocode">工单号</param>
            <param name="saleOrderCode">销售订单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">规格型号</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -2763,7 +2786,7 @@
            生产开报工：开工(开始/报工)/外协(发料/收料)时条件判断及数据返回接口
            </summary>
            <param name="OperType">操作类型：自制(ZZ)/外协(WX)</param>
            <param name="SelectType">操作类型：自制(设备编码)/外协(发料标识(OUT)/收料标识(IN))</param>
            <param name="SelectType">操作类型：自制(开工(START)/报工(REPORT))/外协(发料标识(OUT)/收料标识(IN))</param>
            <param name="orderstepqrcode">扫描二维码信息</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
@@ -2868,13 +2891,14 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            MES工单查询
            </summary>
            <param name="mesorderstus">工单状态码</param>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="saleordercode">销售订单号</param>
            <param name="ordertype">单据类型</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -3250,6 +3274,25 @@
            工艺路线删除
            </summary>
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.RputeInventorySearch(System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            工艺路线关联产品查询
            </summary>
            <param name="partcode">物料编码</param>
            <param name="partname">物料名称</param>
            <param name="partspec">物料规格</param>
            <param name="stocktypecode">存货类型编码</param>
            <param name="materialtypecode">物料类型编码</param>
            <param name="storehousecode">所属仓库编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteBatchPartSave(Newtonsoft.Json.Linq.JObject)">
            <summary>
            工艺路线批量指定物料保存
            </summary>
            <param name="obj">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -4722,7 +4765,7 @@
            扫码信息为工单+工序条码
            </summary>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="SelectType">设备编码</param>
            <param name="SelectType">操作类型(开工：START、报工：REPORT)</param>
            <param name="ordercode">工单编号</param>
            <param name="stepcode">工序编码</param>
            <returns></returns>