Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yxj

2024-05-08 2ec46c24c2f4adf1d431e356a7ca4ade0a9ed52c

 Model/Model.csproj

@@ -104,6 +104,7 @@
    <Compile Include="ClsPay_RewardPunishBillSub.cs" />
    <Compile Include="ClsPay_WorkErrTimesBillMain.cs" />
    <Compile Include="ClsPay_WorkErrTimesBillSub.cs" />
    <Compile Include="ClsGy_MaterialMouldBillSub.cs" />
    <Compile Include="ClsXt_PrintBill_Model.cs" />
    <Compile Include="CRM\ClsCrm_ClueBillMain.cs" />
    <Compile Include="CRM\ClsCrm_ClueBillSub.cs" />
@@ -225,6 +226,9 @@
    <Compile Include="仓库管理\ClsKf_EntrustOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_EntrustOutBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_EntrustReplenishOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepInBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepInBillScheme.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepOutBillScheme.cs" />
    <Compile Include="仓库管理\ClsKf_MateReplenishOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MateOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MateOutBillScheme.cs" />
@@ -235,9 +239,16 @@
    <Compile Include="仓库管理\ClsKf_MateOutRequestBillSub.cs" />
    <Compile Include="仓库管理\ClsKF_ChangeBoxBillMain.cs" />
    <Compile Include="仓库管理\ClsKF_ChangeBoxBillSub.cs" />
    <Compile Include="仓库管理\ClsSc_ProductionReturnBillSub.cs" />
    <Compile Include="仓库管理\ClsSc_ProductionReturnBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_StepFoldInBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_StepFoldInBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_StepFoldOutBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_StepFoldOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillScheme.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepInBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepOutBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_OtherInBillMain.cs" />
@@ -277,7 +288,17 @@
    <Compile Include="信息平台\ClsOA_ComFileBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ComFileBillSub.cs" />
    <Compile Include="信息平台\ClsOA_EmpMinMessage.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackCheckBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackHandleBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackCheckBillSub.cs" />
    <Compile Include="信息平台\ClsOA_AndengFlowRuleBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackSignBill.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackReceiveBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackBillMain.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackHandleBillSub.cs" />
    <Compile Include="信息平台\ClsOA_AndengFlowRuleBillSub.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackSignBillSub.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackReceiveBillSub.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackBillSub.cs" />
    <Compile Include="信息平台\ClsOA_ErrMsgBackBillSub2.cs" />
    <Compile Include="信息平台\ClsOA_InformBillMain.cs" />
@@ -291,6 +312,10 @@
    <Compile Include="信息平台\ClsOA_MeetNotifyBillSub.cs" />
    <Compile Include="信息平台\ClsOA_NewMain.cs" />
    <Compile Include="信息平台\ClsOA_NewSub.cs" />
    <Compile Include="器具管理\ClsSc_MouldLowerBillMain.cs" />
    <Compile Include="器具管理\ClsSc_MouldLowerBillSub.cs" />
    <Compile Include="器具管理\ClsSc_MouldUpperBillSub.cs" />
    <Compile Include="器具管理\ClsSc_MouldUpperBillMain.cs" />
    <Compile Include="基础资料\K3基础资料\ClsK3_Customer_Model.cs" />
    <Compile Include="基础资料\K3基础资料\ClsK3_Department_Model.cs" />
    <Compile Include="基础资料\K3基础资料\ClsK3_Employee_Model.cs" />
@@ -330,7 +355,17 @@
    <Compile Include="基础资料\基础资料\ClsGy_AreaUser_Model.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="基础资料\基础资料\ClsGy_BadPhenomena_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_BadResult_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CardChangeType_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CardStatus_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CardAddress_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_CardType_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_DotCheckItemMethod_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_DotCheckItemClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_ErrMsgBackType_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_TaskClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_ProjectClass_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_StockCheckItem_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_InspectInstruMent_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_InspectBasis_Model.cs" />
@@ -351,6 +386,7 @@
    <Compile Include="基础资料\基础资料\ClsGy_Operator_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RateType_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_Staff_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_ProjectMoney_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_TaxMIXMain_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_TaxMIXSub_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_TaxRate_Model.cs" />
@@ -435,6 +471,8 @@
    <Compile Include="工资管理\ClsHR_EmpDimissionBillSub.cs" />
    <Compile Include="工资管理\ClsHR_EmpEngageRequestBillMain.cs" />
    <Compile Include="工资管理\ClsHR_EmpEngageRequestBillSub.cs" />
    <Compile Include="工资管理\ClsHR_EmployeeSkillBillMain.cs" />
    <Compile Include="工资管理\ClsHR_EmployeeSkillBillSub.cs" />
    <Compile Include="工资管理\ClsPay_CarOutApplyBillMain.cs" />
    <Compile Include="工资管理\ClsPay_CarOutApplyBillSub.cs" />
    <Compile Include="工资管理\ClsPay_EmpInitChangeBillMain.cs" />
@@ -451,6 +489,9 @@
    <Compile Include="工资管理\ClsPay_SubsidyChangeBillSub.cs" />
    <Compile Include="工资管理\ClsPay_SumBalBillMain .cs" />
    <Compile Include="工资管理\ClsPay_SumBalBillSub.cs" />
    <Compile Include="工资管理\ClsHR_PostSkillBillMain.cs" />
    <Compile Include="工资管理\ClsHR_PostSkillBillSub.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveOtherBillSub.cs" />
    <Compile Include="成本管理\ClsCB_ChangeMoneyBillMain.cs" />
    <Compile Include="成本管理\ClsCB_ChangeMoneyBillSub.cs" />
    <Compile Include="成本管理\ClsCB_EntrustMoneyCost_M.cs" />
@@ -597,8 +638,22 @@
    <Compile Include="生产管理\模具管理\ClsSc_MouldStockBillMain.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldStockBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsGy_EquipTypeBill.cs" />
    <Compile Include="生产管理\设备管理\ClsGy_FixCardChangeBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsGy_FixCardBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsGy_FixCardBillSub_Emp.cs" />
    <Compile Include="系统公用\ClsXt_SystemParameter_Model.cs" />
    <Compile Include="计划管理\ClsGy_MaterialTechParamBillSub.cs" />
    <Compile Include="计划管理\ClsGy_MaterialTechParamBillMain.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdConclusionBillMain.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdConclusionBillSub.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdDisposeCheckBillMain.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdDisposeBillMain.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdDisposeCheckBillSub.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdRequestBillMain.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdDisposeBillSub.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdRequestBillSub.cs" />
    <Compile Include="质检管理\ClsSc_ProcessExchangeBillMain_Note.cs" />
    <Compile Include="质检管理\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
    <Compile Include="质检管理\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
@@ -819,6 +874,8 @@
    </Compile>
    <Compile Include="采购管理\ClsWW_PPBomBillMain.cs" />
    <Compile Include="采购管理\ClsWW_PPBomBillSub.cs" />
    <Compile Include="采购管理\ClsCg_PayableBillMain.cs" />
    <Compile Include="采购管理\ClsCg_PayableSub.cs" />
    <Compile Include="采购管理\Sup_SendGoodsBillMain.cs" />
    <Compile Include="采购管理\Sup_SendGoodsBillSub.cs" />
    <Compile Include="金蝶CLOUD单据\仓库管理\ClsKf_EntrustInBackBillMain_CLD.cs" />
@@ -927,8 +984,12 @@
    <Compile Include="金蝶单据\销售管理\ClsXs_SeOutStockBackBillSub_K3.cs" />
    <Compile Include="金蝶单据\销售管理\ClsXs_SeOutStockBillMain_K3.cs" />
    <Compile Include="金蝶单据\销售管理\ClsXs_SeOutStockBillSub_K3.cs" />
    <Compile Include="销售管理\ClsXs_SellOutChangeBillSub.cs" />
    <Compile Include="销售管理\ClsXs_SellOutChangeBillMain.cs" />
    <Compile Include="销售管理\ClsKf_ICStockBackBillMain.cs" />
    <Compile Include="销售管理\ClsKf_ICStockBackBillSub.cs" />
    <Compile Include="销售管理\ClsXs_ReceivableBillSub.cs" />
    <Compile Include="销售管理\ClsXs_ReceivableBillMain.cs" />
    <Compile Include="销售管理\ClsXs_SeOrderChangeBillSub.cs" />
    <Compile Include="销售管理\ClsXs_SeOrderChangeBillMain.cs" />
    <Compile Include="销售管理\ClsXs_ExceptiveCheckRequestBillSub.cs" />
@@ -952,6 +1013,7 @@
    <Compile Include="销售管理\ClsXs_SellPlanBillSub.cs" />
    <Compile Include="销售管理\ClsXs_SellPlanExecuteBillMain.cs" />
    <Compile Include="销售管理\ClsXs_SellPlanExecuteBillSub.cs" />
    <Compile Include="销售管理\ClsXs_OutDoorCheckBillMain.cs" />
    <Compile Include="销售管理\ClsXs_SeQuotation_ccjgBillMain.cs" />
    <Compile Include="销售管理\ClsXs_SeQuotation_ccjgBillSub.cs" />
    <Compile Include="销售管理\ClsXs_SeDownStockBillMain.cs" />
@@ -970,8 +1032,21 @@
    <Compile Include="销售管理\单证管理\ClsXs_LadingBillSub.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_ShippingAdviceBillMain.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_ShippingAdviceBillSub.cs" />
    <Compile Include="项目管理\ClsPM_ProjectEndBillMain.cs" />
    <Compile Include="项目管理\ClsPM_ProjectBeginBillMain.cs" />
    <Compile Include="项目管理\ClsPM_ProjectEndBillSub.cs" />
    <Compile Include="项目管理\ClsPM_ProjectBeginBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskMoneyBillMain.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskMoneyBillSub.cs" />
    <Compile Include="项目管理\ClsPM_ProjectMoneyBillSub.cs" />
    <Compile Include="项目管理\ClsPM_ProjectMoneyBillMain.cs" />
    <Compile Include="项目管理\ClsPM_CustomerTaskBillMain.cs" />
    <Compile Include="项目管理\ClsGy_MaterialMouldBillMain.cs" />
    <Compile Include="项目管理\ClsPM_WorkPlanMonthBillMain.cs" />
    <Compile Include="项目管理\ClsPM_CustomerTaskBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkReportWeekBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkReportWeekBillMain.cs" />
    <Compile Include="项目管理\ClsPM_WorkPlanMonthBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskWeekBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskWeekBillMain.cs" />
    <Compile Include="项目管理\ClsPro_DesignBlueRequestBillMain.cs" />
@@ -1195,7 +1270,6 @@
    <Compile Include="应收管理\ClsYS_ReceiveBillMain.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveBillSub.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveOtherBillMain.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveOtherBillSub.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveShouldBillMain.cs" />
    <Compile Include="应收管理\ClsYS_ReceiveShouldBillSub.cs" />
    <Compile Include="计划管理\ClsGy_ICBomBillMain.cs" />