1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件...

yl

2023-03-06 11f8321434ede074d8f6e902b0049a56bcff3bd8

 VueWebApi/bin/VueWebApi.xml

@@ -624,6 +624,30 @@
            <param name="onelableqty">单标签数量</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchOrderSave(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.AppPurchOrderSave})">
            <summary>
            采购到货：提交
            </summary>
            <param name="purordercode">采购订单号</param>
            <param name="orderstaus">单据状态:BINARIVE(部分到货)、INARIVE(已到货)</param>
            <param name="username">操作人员</param>
            <param name="json">到货物料信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckScanLabCode(System.String)">
            <summary>
            入厂检验,扫描采购到货生成标签
            </summary>
            <param name="labcode">采购到货生成标签</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckItem(System.String)">
            <summary>
            入厂检验,根据选择的检验方案查找检验项目
            </summary>
            <param name="checkstandcode">检验方案编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.PurchSupplierSelect">
            <summary>
            采购供方信息查询
@@ -654,6 +678,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseOrderSubSearch(System.String)">
            <summary>
            采购订单明细
            </summary>
            <param name="purodercode">采购订单明细</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.PurchaseOrderController.DeletePurchaseOrder(System.String)">
            <summary>
            采购订单删除
@@ -671,6 +702,13 @@
        <member name="M:VueWebApi.Controllers.PurchaseOrderController.ReversVerifyPurchaseOrder(System.String)">
            <summary>
            采购订单反审核
            </summary>
            <param name="po">采购订单号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.PurchaseOrderController.ClosedPurchaseOrder(System.String)">
            <summary>
            采购订单关闭
            </summary>
            <param name="po">采购订单号</param>
            <returns></returns>
@@ -707,10 +745,11 @@
            <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)">
        <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)">
            <summary>
            班组工资报表记录查询
            </summary>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -719,6 +758,7 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -732,10 +772,11 @@
            <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)">
        <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)">
            <summary>
            班组工资报表记录查询
            </summary>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -744,12 +785,14 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <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)">
        <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)">
            <summary>
            人员工资明细报表
            </summary>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -758,16 +801,18 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <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)">
        <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)">
            <summary>
            人员工资明细报表导出
            </summary>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -776,6 +821,7 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <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)">
@@ -2217,6 +2263,15 @@
            <param name="partnumber">产品编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteOrWkshop(System.String,System.String,System.String)">
            <summary>
            工单派发选择工艺路线或选择生产车间时判断绑定条件
            </summary>
            <param name="partcode">产品编码</param>
            <param name="routecode">工艺路线编码</param>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.AddUpdateMesOrder(Newtonsoft.Json.Linq.JObject)">
            <summary>
            MES工单新增、编辑提交
@@ -2822,13 +2877,14 @@
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqpList(System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqpList(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            根据工序线编码查找关联设备列表集合
            </summary>
            <param name="partcode">产品编码</param>
             <param name="routecode">工艺路线编码</param>
            <param name="stepcode">工序编码</param>
            <param name="steptype">工序类型</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -3002,6 +3058,43 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            质检方案列表查询
            </summary>
            <param name="qualityinsptcode">质检方案编码</param>
            <param name="qualityinsptname">质检方案名称</param>
            <param name="status">有效状态</param>
            <param name="checktype">质检类型</param>
            <param name="sampltype">抽样方式</param>
            <param name="suitobject">适用对象</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionSeeEdit(System.String)">
            <summary>
            质检方案查看编辑
            </summary>
            <param name="qualityinsptcode">质检方案编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionAddEditSave(Newtonsoft.Json.Linq.JObject)">
            <summary>
            质检方案新增/编辑提交
            </summary>
            <param name="obj">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.QualityInspectionDelete(System.String)">
            <summary>
            质检方案删除
            </summary>
            <param name="qualityinsptcode">质检方案编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.SystemSettingController.EncodingRules(System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            编码规则查询
@@ -3154,15 +3247,117 @@
            注册Session
            </summary>
        </member>
        <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String)">
        <member name="P:VueWebApi.Models.AppLabCode.rightcode">
            <summary>
            功能编码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppLabCode.labcode">
            <summary>
            标签条码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppLabCode.labqty">
            <summary>
            标签数量
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppLabCode.partnumber">
            <summary>
            物料编码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hacceptdate">
            <summary>
            预计到货日期
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hdepartmentcode">
            <summary>
            部门编码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hcustomercode">
            <summary>
            供应商编码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hbatchno">
            <summary>
            批次号
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hsourcebillno">
            <summary>
            源单单号(采购订单号)
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.rownumber">
            <summary>
            行号
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hpartcode">
            <summary>
            物料编码
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hplanqty">
            <summary>
            订单数量
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hqty">
            <summary>
            到货数量
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.hischeck">
            <summary>
            物料是否需检验
            </summary>
        </member>
        <member name="P:VueWebApi.Models.AppPurchOrderSave.children">
            <summary>
            条码信息
            </summary>
        </member>
        <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
            <summary>
            根据功能编码获取最新规则编码
            </summary>
            <param name="rightcode">功能编码</param>
            <param name="partcode">物料编码</param>
            <param name="qty">数量</param>
            <param name="onelabqty">单标签数量</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Tools.AppLableBarCode.Labcode(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.Decimal,System.Decimal,System.String,System.String,System.String,System.String@)">
            <summary>
            生成条码
            </summary>
            <param name="partcode">物料编码</param>
            <param name="year">年</param>
            <param name="month">月</param>
            <param name="day">日</param>
            <param name="prefix">固定字段</param>
            <param name="fdate">年(2位)+月(2位)+日(2位)</param>
            <param name="digit2">流水号长度</param>
            <param name="value2">自增流水号</param>
            <param name="digit3">自增流水号长度</param>
            <param name="digitdiff">位数差</param>
            <param name="q">补位(0)</param>
            <param name="cunm2">最终流水号(包含补位)</param>
            <param name="Encode">最终标签码(固定字段+规则+最终流水号)</param>
            <param name="value">初始查询最新流水号</param>
            <param name="labcum">标签个数</param>
            <param name="sumqty">累计单标签数量</param>
            <param name="onelabqty">单标签数量</param>
            <param name="rightcode">功能编码</param>
            <param name="qty">数量</param>
            <param name="cunm">输出最终流水号</param>
            <returns></returns>
        </member>
        <member name="T:VueWebApi.Tools.ChannelActionFilterAttribute">
            <summary>
            渠道过滤器