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

yusijie

2024-12-05 8c7d0e365d20f5f7d05e59afc1c39daeb0dfd690

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

 APSM/bin/Release/APSM.dll

Binary files differ

 APSM/bin/Release/APSM.pdb

Binary files differ

 APSM/bin/Release/BLL.dll

Binary files differ

 APSM/bin/Release/BLL.pdb

Binary files differ

 APSM/bin/Release/BaseSet.dll

Binary files differ

 APSM/bin/Release/BaseSet.pdb

Binary files differ

 APSM/bin/Release/DAL.dll

Binary files differ

 APSM/bin/Release/DAL.pdb

Binary files differ

 APSM/bin/Release/DBUtility.dll

Binary files differ

 APSM/bin/Release/DBUtility.pdb

Binary files differ

 APSM/bin/Release/Model.dll

Binary files differ

 APSM/bin/Release/Model.pdb

Binary files differ

 APSM/bin/Release/PlanM.dll

Binary files differ

 APSM/bin/Release/PlanM.pdb

Binary files differ

 APSM/bin/Release/Pub_Class.dll

Binary files differ

 APSM/bin/Release/Pub_Class.pdb

Binary files differ

 APSM/bin/Release/Pub_Control.dll

Binary files differ

 APSM/bin/Release/Pub_Control.pdb

Binary files differ

 APSM/bin/Release/SQLHelper.dll

Binary files differ

 APSM/bin/Release/SQLHelper.pdb

Binary files differ

 APSM/bin/Release/WarM.dll

Binary files differ

 APSM/bin/Release/WarM.pdb

Binary files differ

 APSM/bin/Release/WorkM.dll

Binary files differ

 APSM/bin/Release/WorkM.pdb

Binary files differ

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BaseSet/bin/Release/BLL.dll

Binary files differ

 BaseSet/bin/Release/BLL.pdb

Binary files differ

 BaseSet/bin/Release/BaseSet.dll

Binary files differ

 BaseSet/bin/Release/BaseSet.pdb

Binary files differ

 BaseSet/bin/Release/DAL.dll

Binary files differ

 BaseSet/bin/Release/DAL.pdb

Binary files differ

 BaseSet/bin/Release/DBUtility.dll

Binary files differ

 BaseSet/bin/Release/DBUtility.pdb

Binary files differ

 BaseSet/bin/Release/Model.dll

Binary files differ

 BaseSet/bin/Release/Model.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Class.dll

Binary files differ

 BaseSet/bin/Release/Pub_Class.pdb

Binary files differ

 BaseSet/bin/Release/Pub_Control.dll

Binary files differ

 BaseSet/bin/Release/Pub_Control.pdb

Binary files differ

 BaseSet/bin/Release/SQLHelper.dll

Binary files differ

 BaseSet/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/DAL.csproj

@@ -93,6 +93,7 @@
    <Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
    <Compile Include="质检管理\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
    <Compile Include="质检管理\ClsQC_MonthTarGetBill.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSignBill.cs" />
    <Compile Include="WMS\ClsWMS_CusBarCodeCheckBill.cs" />
@@ -688,6 +689,7 @@
    <Compile Include="质检管理\ClsQC_ProcessCheckBill.cs" />
    <Compile Include="质检管理\ClsQC_ProdReportCheckBill.cs" />
    <Compile Include="质检管理\ClsCrm_CustomerAppealBill.cs" />
    <Compile Include="质检管理\ClsGy_EnvironmentTestSchemeBillMain.cs" />
    <Compile Include="车间管理\ClsGy_MaterPreventErrMouldBillMain.cs" />
    <Compile Include="车间管理\ClsQc_PreventErrMouldCheckBillMain.cs" />
    <Compile Include="车间管理\ClsGy_WorkBeginDotCheckListBillMain.cs" />

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBill.cs

@@ -121,6 +121,7 @@
                ",HMainSourceEntryID=" + omodel.HMainSourceEntryID.ToString() +
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo.ToString() +
                "',HMainSourceBillType='" + omodel.HMainSourceBillType.ToString() +
                "',HProjectID='" + omodel.HProjectID.ToString() +
                "' where HInterID=" + lngBillKey.ToString());
                if (DetailColl.Count != 0)
                {
@@ -195,7 +196,7 @@
                ",HAccDate,HSupID,HAccSupID,HSSID,HCurID,HExRate" +
                ",HDeptID,HEmpID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
                ",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus,HInvoiceBillNo,HBigMoney,HReason,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus,HInvoiceBillNo,HBigMoney,HReason,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HProjectID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
@@ -203,7 +204,7 @@
                ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation +"'"+
                ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() + 
                ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() + ",'" + omodel.HInvoiceBillNo + "','" + omodel.HBigMoney + "','" + omodel.HReason +
                "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'"+
                "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HProjectID + "'" +
                " ) ");
                //插入子表
                foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
@@ -294,6 +295,8 @@
                omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                omodel.HProjectID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProjectID"]); ;
                
                //========================================================
                omodel.HAccDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAccDate"]);
                omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);

 DAL/Öʼì¹ÜÀí/ClsGy_EnvironmentTestSchemeBillMain.cs

New file
@@ -0,0 +1,256 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace DAL
{
    public  class ClsGy_EnvironmentTestSchemeBillMain : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsGy_EnvironmentTestSchemeBillMain omodel = new Model.ClsGy_EnvironmentTestSchemeBillMain();
        public List<Model.ClsGy_EnvironmentTestSchemeBillSub> DetailColl = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();

        public ClsGy_EnvironmentTestSchemeBillMain()
        {
            base.MvarItemKeySub = "Gy_EnvironmentTestSchemeBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey= "Gy_EnvironmentTestSchemeBillMain";
            base.MvarReportTitle="环境检测方案";
            base.BillType = "3340";
            base.HBillSubType = "3340";

        }

        #region å›ºå®šä»£ç 

        ~ClsGy_EnvironmentTestSchemeBillMain()
        {
            DetailColl = null;
        }
       
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {

                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Gy_EnvironmentTestSchemeBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + omodel.HMaker + "'" +
                ",HUpDateDate=getdate()" +
                //========================================

                ",HDeptID =" + omodel.HDeptID.ToString() +
                ",HCenterWorkID =" + omodel.HCenterWorkID.ToString() +
                ",HProcID =" + omodel.HProcID.ToString() +

                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);

                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oSub in DetailColl)
                {
                    string subSql = "insert into Gy_EnvironmentTestSchemeBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPrjNo,HEnvironmentItemID,HTargetVal,HUpLimit,HDownLimit) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
                        "," + oSub.HSourceInterID +
                        "," + oSub.HSourceEntryID +
                        ",'" + oSub.HSourceBillNo +
                        "','" + oSub.HSourceBillType +
                        "','" + oSub.HRemark +
                        "','" + oSub.HPrjNo +
                        "','" + oSub.HEnvironmentItemID +
                        "','" + oSub.HTargetVal +
                        "','" + oSub.HUpLimit +
                        "','" + oSub.HDownLimit +
                        "')";
                    oCn.RunProc(subSql);
                }


                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {

                DataSet ds;

                oCn.BeginTran();

                //检查主表内码是否重复，若重复则重新生成并继续检查，直到不再重复
                while (true)
                {
                    ds = oCn.RunProcReturn("select * from Gy_EnvironmentTestSchemeBillMain where HInterID = " + omodel.HInterID, "Gy_EnvironmentTestSchemeBillMain");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    else
                    {
                        break;
                    }
                }

                //主表
                string mainSql = "insert into Gy_EnvironmentTestSchemeBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
                    ",HDeptID,HCenterWorkID,HProcID) " +
                    "values(" +
                    "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
                    "," + omodel.HPeriod.ToString() +
                    ",'" + this.BillType +
                    "','" + this.HBillSubType +
                    "'," + omodel.HInterID +
                    ",'" + omodel.HDate +
                    "','" + omodel.HBillNo +
                    "','" + omodel.HRemark +
                    "','getdate()" +
                    "','" + omodel.HMakeDate +                  
                    "','" + omodel.HDeptID +
                    "','" + omodel.HCenterWorkID +
                    "','" + omodel.HProcID +
                    "')";

                oCn.RunProc(mainSql);

                //插入子表
                foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oSub in DetailColl)
                {
                    string subSql = "insert into Gy_EnvironmentTestSchemeBillSub " +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                         ",HPrjNo,HEnvironmentItemID,HTargetVal,HUpLimit,HDownLimit) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
                         "," + oSub.HSourceInterID +
                         "," + oSub.HSourceEntryID +
                         ",'" + oSub.HSourceBillNo +
                         "','" + oSub.HSourceBillType +
                         "','" + oSub.HRemark +
                         "','" + oSub.HPrjNo +
                         "','" + oSub.HEnvironmentItemID +
                         "','" + oSub.HTargetVal +
                         "','" + oSub.HUpLimit +
                         "','" + oSub.HDownLimit +
                         "')";
                    oCn.RunProc(subSql);
                }

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds ;
                Ds = oCn.RunProcReturn("Select * from Gy_EnvironmentTestSchemeBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_EnvironmentTestSchemeBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";
                    return false;
                }
                //固定赋值===========================================
                omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================
              
                //
                
                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from Gy_EnvironmentTestSchemeBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_WorkBeginDotCheckBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsGy_EnvironmentTestSchemeBillSub oSub = new Model.ClsGy_EnvironmentTestSchemeBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); 
                    oSub.HCloseMan =  DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================
                  
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
       
        
    }

}

 DAL/Öʼì¹ÜÀí/ClsQC_EnvironmentTestDotCheckBillMain.cs

New file
@@ -0,0 +1,267 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace DAL
{
    public  class ClsQC_EnvironmentTestDotCheckBillMain : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsQC_EnvironmentTestDotCheckBillMain omodel = new Model.ClsQC_EnvironmentTestDotCheckBillMain();
        public List<Model.ClsQC_EnvironmentTestDotCheckBillSub> DetailColl = new List<Model.ClsQC_EnvironmentTestDotCheckBillSub>();

        public ClsQC_EnvironmentTestDotCheckBillMain()
        {
            base.MvarItemKeySub = "QC_EnvironmentTestDotCheckBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey= "QC_EnvironmentTestDotCheckBillMain";
            base.MvarReportTitle="环境检测单";
            base.BillType = "7524";
            base.HBillSubType = "7524";

        }

        #region å›ºå®šä»£ç 

        ~ClsQC_EnvironmentTestDotCheckBillMain()
        {
            DetailColl = null;
        }
       
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {

                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate QC_EnvironmentTestDotCheckBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + omodel.HMaker + "'" +
                ",HUpDateDate=getdate()" +
                //========================================

                ",HDeptID =" + omodel.HDeptID.ToString() +
                ",HCenterWorkID =" + omodel.HCenterWorkID.ToString() +
                ",HProcID =" + omodel.HProcID.ToString() +
                ",HCleanType ='" + omodel.HCleanType.ToString() +
                "',HErrMsgBack ='" + omodel.HErrMsgBack.ToString() +
                "',HNote ='" + omodel.HNote.ToString() +
                "',HEmpID =" + omodel.HEmpID.ToString() +
                ",HEnvironmentTestSchemeID =" + omodel.HEnvironmentTestSchemeID.ToString() +
                ",HOrgID =" + omodel.HOrgID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);

                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oSub in DetailColl)
                {
                    string subSql = "insert into QC_EnvironmentTestDotCheckBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HEnvironmentItemID,HMeasure,HTargetVal,HUpLimit,HDownLimit) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
                        "," + oSub.HSourceInterID +
                        "," + oSub.HSourceEntryID +
                        ",'" + oSub.HSourceBillNo +
                        "','" + oSub.HSourceBillType +
                        "','" + oSub.HRemark +
                        "','" + oSub.HEnvironmentItemID +
                        "','" + oSub.HMeasure +
                        "','" + oSub.HTargetVal +
                        "','" + oSub.HUpLimit +
                        "','" + oSub.HDownLimit +
                        "')";
                    oCn.RunProc(subSql);
                }


                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {

                DataSet ds;

                oCn.BeginTran();

                //检查主表内码是否重复，若重复则重新生成并继续检查，直到不再重复
                while (true)
                {
                    ds = oCn.RunProcReturn("select * from QC_EnvironmentTestDotCheckBillMain where HInterID = " + omodel.HInterID, "QC_EnvironmentTestDotCheckBillMain");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    else
                    {
                        break;
                    }
                }

                //主表
                string mainSql = "insert into QC_EnvironmentTestDotCheckBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
                    ",HDeptID,HCenterWorkID,HProcID,HCleanType,HErrMsgBack,HNote,HEmpID,HEnvironmentTestSchemeID,HOrgID ) " +
                    "values(" +
                    "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
                    "," + omodel.HPeriod.ToString() +
                    ",'" + this.BillType +
                    "','" + this.HBillSubType +
                    "'," + omodel.HInterID +
                    ",'" + omodel.HDate +
                    "','" + omodel.HBillNo +
                    "','" + omodel.HRemark +
                    "','" + omodel.HMaker +
                    "',getdate()" +
                    ",'" + omodel.HDeptID +
                    "','" + omodel.HCenterWorkID +
                    "','" + omodel.HProcID +
                    "','" + omodel.HCleanType +
                    "','" + omodel.HErrMsgBack +
                    "','" + omodel.HNote +
                    "','" + omodel.HEmpID +
                    "','" + omodel.HEnvironmentTestSchemeID +
                     "','" + omodel.HOrgID +
                    "')";

                oCn.RunProc(mainSql);

                //插入子表
                foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oSub in DetailColl)
                {
                    string subSql = "insert into QC_EnvironmentTestDotCheckBillSub " +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                         ",HEnvironmentItemID,HMeasure,HTargetVal,HUpLimit,HDownLimit) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
                         "," + oSub.HSourceInterID +
                         "," + oSub.HSourceEntryID +
                         ",'" + oSub.HSourceBillNo +
                         "','" + oSub.HSourceBillType +
                         "','" + oSub.HRemark +
                         "','" + oSub.HEnvironmentItemID +
                         "','" + oSub.HMeasure +
                         "','" + oSub.HTargetVal +
                         "','" + oSub.HUpLimit +
                         "','" + oSub.HDownLimit +
                         "')";
                    oCn.RunProc(subSql);
                }

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds ;
                Ds = oCn.RunProcReturn("Select * from QC_EnvironmentTestDotCheckBillMain Where HInterID=" + lngBillKey.ToString(), "QC_EnvironmentTestDotCheckBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";
                    return false;
                }
                //固定赋值===========================================
                omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================
              
                //
                
                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from QC_EnvironmentTestDotCheckBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_WorkBeginDotCheckBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsQC_EnvironmentTestDotCheckBillSub oSub = new Model.ClsQC_EnvironmentTestDotCheckBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); 
                    oSub.HCloseMan =  DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================
                  
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
       
        
    }

}

 DAL/ÏúÊÛ¹ÜÀí/ClsXs_ReceivableBill.cs

@@ -116,6 +116,7 @@
                    ",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
                    ",HRemark = '" + omodel.HRemark + "'" +
                    ",HPriceType = '" + omodel.HPriceType + "'" +
                    ",HProjectID = '" + omodel.HProjectID + "'" +
                    " where HInterID = " + omodel.HInterID;
                oCn.RunProc(mainSql);

@@ -260,7 +261,7 @@
                string mainSql = "insert into Xs_ReceivableBillMain" +
                    "(HInterID,HBillNo,HDate,HYear,HPeriod,HBillType,HBillSubType" +
                    ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                    ",HMaker,HMakeDate,HSSID,HSellSID,HReceiveDate,HCusID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark,HPriceType) " +
                    ",HMaker,HMakeDate,HSSID,HSellSID,HReceiveDate,HCusID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark,HPriceType,HProjectID) " +
                    "values(" +
                    "" + omodel.HInterID + "" +
                    ",'" + omodel.HBillNo + "'" +
@@ -288,6 +289,7 @@
                    ",'" + omodel.HInnerBillNo + "'" +
                    ",'" + omodel.HRemark + "'" +
                    ",'" + omodel.HPriceType + "'" +
                    ",'" + omodel.HProjectID + "'" +
                    ")";

                oCn.RunProc(mainSql);
@@ -469,8 +471,8 @@
                omodel.HExRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExRate"]);
                omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
                omodel.HMangerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMangerID"]);
                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);

                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]); 
                omodel.HProjectID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProjectID"]);
                omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
                omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
                omodel.HHookMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HHookMan"]);

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/Model.csproj

@@ -151,6 +151,8 @@
    <Compile Include="基础资料\基础资料\ClsGy_TechnologyParameterType_Model .cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RestDay_Model.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
    <Compile Include="质检管理\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
    <Compile Include="质检管理\ClsQC_EnvironmentTestDotCheckBillSub.cs" />
    <Compile Include="质检管理\ClsQC_MonthTarGetBillMain.cs" />
    <Compile Include="质检管理\ClsQC_MonthTarGetBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSignBillMain.cs" />
@@ -702,7 +704,9 @@
    <Compile Include="质检管理\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
    <Compile Include="质检管理\ClsCrm_CustomerAppealBillSub.cs" />
    <Compile Include="质检管理\ClsCrm_CustomerAppealBillMain.cs" />
    <Compile Include="质检管理\ClsGy_EnvironmentTestSchemeBillMain.cs" />
    <Compile Include="车间管理\ClsGy_MaterPreventErrMouldBillMain.cs" />
    <Compile Include="质检管理\ClsGy_EnvironmentTestSchemeBillSub.cs" />
    <Compile Include="车间管理\ClsQc_PreventErrMouldCheckBillMain.cs" />
    <Compile Include="车间管理\ClsGy_WorkBeginDotCheckListBillMain.cs" />
    <Compile Include="车间管理\ClsCJ_WIPBeginStockBillMain.cs" />

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldInBillMain.cs

@@ -22,6 +22,8 @@
        public string HExplanation; //        varchar(200)    --ÕªÒª 
        public string HInnerBillNo; //       varchar(50)        --内部单据号

        public Int64 HProjectID;        //-项目

        public Int64 HCurID;
    }
}

 Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldOutBillMain.cs

@@ -24,5 +24,7 @@
        public Int64 HCurID;
        public Int64 HPSStyleID;

        public Int64 HProjectID;        //-项目

    }
}

 Model/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBillMain.cs

@@ -33,5 +33,6 @@
        public string HInvoiceBillNo;//    varchar(100)      --发票编号
        public string HBigMoney;//    varchar(100) --大写金额
        public string HReason;//    varchar(400) --付款事由
        public Int64 HProjectID;//   int          //项目id
    }
}

 Model/Öʼì¹ÜÀí/ClsGy_EnvironmentTestSchemeBillMain.cs

New file
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsGy_EnvironmentTestSchemeBillMain : DBUtility.ClsXt_BaseBillMain
    {
     
        public Int64 HDeptID;          //int ---生产部门（Gy_Department）
        public Int64 HCenterWorkID;          //int --工作中心（Gy_WorkCenter）
        public Int64 HProcID;          //int --工序（gy_Process）

    }
}

 Model/Öʼì¹ÜÀí/ClsGy_EnvironmentTestSchemeBillSub.cs

New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsGy_EnvironmentTestSchemeBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HPrjNo;  // int --次序号
        public Int64 HEnvironmentItemID;  // int --检测项目(Gy_EnvironmentTestItem)
        public string HTargetVal;     // varchar(200) --目标值
        public string HUpLimit;     //varchar(200) --上限值
        public string HDownLimit;     // varchar(200) --下限值

    }
}

 Model/Öʼì¹ÜÀí/ClsQC_EnvironmentTestDotCheckBillMain.cs

New file
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsQC_EnvironmentTestDotCheckBillMain : DBUtility.ClsXt_BaseBillMain
    {
     
        public Int64 HDeptID;          //int ---生产部门（Gy_Department）
        public Int64 HCenterWorkID;          //int --工作中心（Gy_WorkCenter）
        public Int64 HProcID;          //int --工序（gy_Process）
        public string HCleanType;          //varchar(20) --洁净度（A，B，C）
        public string HErrMsgBack;          //varchar(500)--异常原因
        public string HNote;          //varchar(500) --改善对策
        public Int64 HEmpID;          //int   --记录人（Gy_Employee）
        public string HEnvironmentTestSchemeID;          //int --环境检测方案(Gy_EnvironmentTestSchemeBillMain)
        public Int64 HOrgID;          // int --组织
    }
}

 Model/Öʼì¹ÜÀí/ClsQC_EnvironmentTestDotCheckBillSub.cs

New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsQC_EnvironmentTestDotCheckBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HEnvironmentItemID;  // int --检测项目(Gy_EnvironmentTestItem)
        public string HMeasure;     // varchar(200) --实际值
        public string HTargetVal;     // varchar(200) --目标值
        public string HUpLimit;     //varchar(200) --上限值
        public string HDownLimit;     // varchar(200) --下限值

    }
}

 Model/ÏúÊÛ¹ÜÀí/ClsXs_ReceivableBillMain.cs

@@ -26,5 +26,7 @@
        public double HCheckMoneyFor;   //dec(18,8) --核销金额本位币
        public double HRemainMoney;     //dec(18,8) --剩余核销金额
        public int HCheckStatus;        //int       --核销状态

        public Int64 HProjectID;             //int       --项目id 
    }
}

 NETERPNoWin/NETERPNoWin_TemporaryKey.pfx

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.application

New file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
  <assemblyIdentity name="NETERPNoWin.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <description asmv2:publisher="HP Inc." asmv2:product="NETERPNoWin" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <deployment install="true" mapFileExtensions="true" />
  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
    <framework targetVersion="4.5" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
    <dependentAssembly dependencyType="install" codebase="NETERPNoWin.exe.manifest" size="18507">
      <assemblyIdentity name="NETERPNoWin.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>wn6gDGFowhafL12XPIF0XvaVbBwEna2/PFXnf/CQVvE=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
</asmv1:assembly>

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.manifest

New file
@@ -0,0 +1,348 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
  <asmv1:assemblyIdentity name="NETERPNoWin.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
  <description asmv2:iconFile="Main.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <application />
  <entryPoint>
    <assemblyIdentity name="NETERPNoWin" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
    <commandLine file="NETERPNoWin.exe" parameters="" />
  </entryPoint>
  <trustInfo>
    <security>
      <applicationRequestMinimum>
        <PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
        <defaultAssemblyRequest permissionSetReference="Custom" />
      </applicationRequestMinimum>
      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
        <!--
          UAC æ¸…单选项
          å¦‚果要更改 Windows ç”¨æˆ·å¸æˆ·æŽ§åˆ¶çº§åˆ«ï¼Œè¯·ç”¨ä»¥ä¸‹èŠ‚点之一替换
          requestedExecutionLevel èŠ‚点。

        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />

          å¦‚果要利用文件和注册表虚拟化提供
          å‘后兼容性，请删除 requestedExecutionLevel èŠ‚点。
    -->
        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
      </requestedPrivileges>
    </security>
  </trustInfo>
  <dependency>
    <dependentOS>
      <osVersionInfo>
        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
      </osVersionInfo>
    </dependentOS>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="AxInterop.grdes6Lib.dll" size="19968">
      <assemblyIdentity name="AxInterop.grdes6Lib" version="6.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>cDOsFpy7Q9dEPvyW2k7KNGF2wzIHu2tDsAosbOwe/bg=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="AxInterop.gregn6Lib.dll" size="52736">
      <assemblyIdentity name="AxInterop.gregn6Lib" version="6.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>B9JmnIhou5qT2K4SKRQmXMK8w6vcJJMP5XRxdLmWcCM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BaseSet.dll" size="11132416">
      <assemblyIdentity name="BaseSet" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>d5gbQHopFdXesufOH9BgZRBzZ0OnBTwu3UdJTa1wa/I=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLL.dll" size="2790912">
      <assemblyIdentity name="BLL" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>/X1TrpMJd8doE+k9+ijEHRsHPhzQ8dpvbFSVlsHNyrk=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DAL.dll" size="5164544">
      <assemblyIdentity name="DAL" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>JxWiwWRhXFHWGOzAiQjlFP8/3vv7D/lne34Iu5QreHM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DBUtility.dll" size="574464">
      <assemblyIdentity name="DBUtility" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>GwgiXU39CKJzWQZ89GZ1sJOKDFtyQrVw5L+Ls38rz/Y=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Interop.gregn6Lib.dll" size="357376">
      <assemblyIdentity name="Interop.gregn6Lib" version="6.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>NTRe8cKyaB2Wx16b5iEtmoU9q9h3+gryStw/xWMEfF4=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kanban.dll" size="676352">
      <assemblyIdentity name="Kanban" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>dUyadyt2NlkwDLyhR+tN/bB85Z1cpuEQxAoTQMM6mw8=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kingdee.BOS.WebApi.Client.dll" size="289312">
      <assemblyIdentity name="Kingdee.BOS.WebApi.Client" version="7.2.904.6" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>dSAEwQYfk0Y5qmdoBVOgzVwKZJcZhii5MBL5XFKp2xc=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Model.dll" size="291840">
      <assemblyIdentity name="Model" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>k/+EL2Sr9bbB4ZKV70cyLnoQOMHYkisdNnfYBMF24xQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="NETERPNoWin.exe" size="473056">
      <assemblyIdentity name="NETERPNoWin" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>cCtWPXQrdBSmZHEiLLDnu0YHkuCs8xUhjvlnNhdSAfQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Newtonsoft.Json.dll" size="345600">
      <assemblyIdentity name="Newtonsoft.Json" version="4.0.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>JLoNADadroH9llzMtEtuwZAPjow+SUuulyrheECuqGs=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="NPOI.dll" size="1606144">
      <assemblyIdentity name="NPOI" version="2.1.3.1" publicKeyToken="0DF73EC7942B34E1" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>FNfK86Hd2KVVWoUEjnCJriXx9vq6inxyvjScN4H7HeI=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="NPOI.OOXML.dll" size="423936">
      <assemblyIdentity name="NPOI.OOXML" version="2.1.3.1" publicKeyToken="0DF73EC7942B34E1" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>aPV7DUrEKNkJ98OTFbt40gRnVowTYDy5HsXmpKR0LhA=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="NPOI.OpenXml4Net.dll" size="85504">
      <assemblyIdentity name="NPOI.OpenXml4Net" version="2.1.3.1" publicKeyToken="0DF73EC7942B34E1" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>1THFKX/C7xz0LHocCBQNN8m125+eduLZLmvtN+zZmbA=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="NPOI.OpenXmlFormats.dll" size="1902592">
      <assemblyIdentity name="NPOI.OpenXmlFormats" version="2.1.3.1" publicKeyToken="0DF73EC7942B34E1" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>SC1w9LYkSs1QksE/+gY29sZ0ov/q+p2DGMvkvKm116k=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OAM.dll" size="12816896">
      <assemblyIdentity name="OAM" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>IwTIE08SjE+CybYOJpT8w91GO7jilTnY0x6CPkrhykY=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PlanM.dll" size="2540544">
      <assemblyIdentity name="PlanM" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>ijEKK1PiUD8ZYIDAE1sD+NcmxsxGiffyHRvjkf0VHqo=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Pub_Class.dll" size="206336">
      <assemblyIdentity name="Pub_Class" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>Jo1wkmu/jZPowAleaPPXVuGjQz4i+T9RYbEH01hA3kw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Pub_Control.dll" size="872448">
      <assemblyIdentity name="Pub_Control" version="1.0.9099.26664" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>oOWNOlS7EB2nTaaAHYwINeuVLOR1MW2aPB+AJSxEDC8=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SQLHelper.dll" size="14336">
      <assemblyIdentity name="SQLHelper" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>V7U/EVUrxuZX/ER6c3yuQVw4mVIVn407t8pnAGJJgU4=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WarM.dll" size="17275904">
      <assemblyIdentity name="WarM" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>sZs50JeIg/Zd94XOuA4uMWsGE/H3selVwxxI0p4M2Tg=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <dependency>
    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WorkM.dll" size="24811520">
      <assemblyIdentity name="WorkM" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>UIjJvDABtIbSJmXUhp4Zbu7nsP9t+9znZRP1AjX8Jqk=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
  <file name="Main.ico" size="19230">
    <hash>
      <dsig:Transforms>
        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
      </dsig:Transforms>
      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
      <dsig:DigestValue>z0sd17gF9Ug5RYRFEwTiOnRiAuYtNim/Q7grshWW0Jg=</dsig:DigestValue>
    </hash>
  </file>
  <file name="NETERPNoWin.exe.config" size="161">
    <hash>
      <dsig:Transforms>
        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
      </dsig:Transforms>
      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
      <dsig:DigestValue>+K0Xw31ERSGzkFzL116my249J2OxbrVrLhqkJ0Fz5hQ=</dsig:DigestValue>
    </hash>
  </file>
  <file name="总控台.ico" size="4150">
    <hash>
      <dsig:Transforms>
        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
      </dsig:Transforms>
      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
      <dsig:DigestValue>wCX+T6P556jmINb1uk9/BUIKGk7dkjtXO25TssCcYXI=</dsig:DigestValue>
    </hash>
  </file>
</asmv1:assembly>

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/stdole.dll

Binary files differ

 NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt

@@ -242,7 +242,6 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb

Binary files differ

 PlanM/bin/Release/BLL.dll

Binary files differ

 PlanM/bin/Release/BLL.pdb

Binary files differ

 PlanM/bin/Release/DAL.dll

Binary files differ

 PlanM/bin/Release/DAL.pdb

Binary files differ

 PlanM/bin/Release/DBUtility.dll

Binary files differ

 PlanM/bin/Release/DBUtility.pdb

Binary files differ

 PlanM/bin/Release/Model.dll

Binary files differ

 PlanM/bin/Release/Model.pdb

Binary files differ

 PlanM/bin/Release/PlanM.dll

Binary files differ

 PlanM/bin/Release/PlanM.pdb

Binary files differ

 PlanM/bin/Release/Pub_Class.dll

Binary files differ

 PlanM/bin/Release/Pub_Class.pdb

Binary files differ

 PlanM/bin/Release/Pub_Control.dll

Binary files differ

 PlanM/bin/Release/Pub_Control.pdb

Binary files differ

 PlanM/bin/Release/SQLHelper.dll

Binary files differ

 PlanM/bin/Release/SQLHelper.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -1,6 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> b75c484393ae95535edada81e805d05c56652931

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs

New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
5dd9c82feb12f833c78ecebea7d9a46c99f29e3f

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

New file
@@ -0,0 +1,6 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WarM/bin/Release/BLL.dll

Binary files differ

 WarM/bin/Release/BLL.pdb

Binary files differ

 WarM/bin/Release/DAL.dll

Binary files differ

 WarM/bin/Release/DAL.pdb

Binary files differ

 WarM/bin/Release/DBUtility.dll

Binary files differ

 WarM/bin/Release/DBUtility.pdb

Binary files differ

 WarM/bin/Release/Model.dll

Binary files differ

 WarM/bin/Release/Model.pdb

Binary files differ

 WarM/bin/Release/Pub_Class.dll

Binary files differ

 WarM/bin/Release/Pub_Class.pdb

Binary files differ

 WarM/bin/Release/Pub_Control.dll

Binary files differ

 WarM/bin/Release/Pub_Control.pdb

Binary files differ

 WarM/bin/Release/SQLHelper.dll

Binary files differ

 WarM/bin/Release/SQLHelper.pdb

Binary files differ

 WarM/bin/Release/WarM.dll

Binary files differ

 WarM/bin/Release/WarM.pdb

Binary files differ

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -38,7 +38,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillEdit where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -1338,7 +1338,7 @@
            try
            {
                
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs

@@ -631,7 +631,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
                ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillEdit where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs

@@ -402,7 +402,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillEdit where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -6,6 +6,8 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Web;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
@@ -23,6 +25,7 @@
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
        string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
        DataSet ds;
        DataSet ds1;

@@ -632,7 +635,6 @@
        }
        #endregion


        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æµæ°´å·å›žè½¦èŽ·å–工序信息
        [Route("Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi")]
        [HttpGet]
@@ -678,8 +680,6 @@
        }
        #endregion



        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æ ¹æ®èŒå‘˜ä»£ç æ¨¡ç³Šå›žè½¦æŸ¥è¯¢
        [Route("Cj_StationInBill/GetMessageByEmpNumber")]
        [HttpGet]
@@ -715,8 +715,6 @@
        }
        #endregion



        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æ ¹æ®ç‰©æ–™ä»£ç æ¨¡ç³Šå›žè½¦æŸ¥è¯¢
        [Route("Cj_StationInBill/GetMessageByMaterNumber")]
        [HttpGet]
@@ -751,9 +749,6 @@
            }
        }
        #endregion




        #region è¿”回工序进站接收单列表
        [Route("Cj_StationInBill/get_Display")]
@@ -1778,5 +1773,188 @@
            }
        }
        #endregion

        #region  å·¥åºè¿›ç«™æ±‡æŠ¥å•æ–‡ä»¶ä¸Šä¼ å¤„理

        [Route("Cj_StationInBill/UploadFile1")]
        [HttpPost]
        public object UploadFile1()
        {

            string HBillNo = HttpContext.Current.Request.Params["HBillNo"];  //单据号
            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //备注
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationInBill/" + HBillNo);
            //string path = @"D:\\Files\\"+ HBillNo;
            dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
            if (dyResult != null && dyResult.result == 1)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "上传成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = dyResult.returnval;
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
        {
            dynamic Result_Ob = new { result = 1, returnval = "上传成功！" };
            string filePath = Path.GetFullPath(files.FileName);//文件上传路径
            string fileExtension = Path.GetExtension(files.FileName);// æ–‡ä»¶æ‰©å±•å
            string filename = files.FileName;//文件名
            string fileSavePath = path;// ä¸Šä¼ ä¿å­˜è·¯å¾„
            int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
            int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M
            try
            {
                if (files == null || files.ContentLength <= 0)
                {
                    Result_Ob = new { result = 0, returnval = "文件不能为空!" };
                    return Result_Ob;
                }
                if (filesize >= Maxsize)
                {
                    Result_Ob = new { result = 0, returnval = "上传文件超过40M，不能上传！" };
                    return Result_Ob;
                }

                string fileurl = Path.Combine(fileSavePath, filename);
                if (Directory.Exists(fileurl) == true)  //如果存在重名文件就提示  
                {
                    Result_Ob = new { result = 0, returnval = "存在同名文件！" };
                    return Result_Ob;
                }
                //删除数据表数据
                ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
                if (Directory.Exists(path))
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Cj_StationInBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
                    }
                }
                else
                {
                    Directory.CreateDirectory(fileSavePath); //添加文件夹
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Cj_StationInBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
                    }
                }

            }
            catch (Exception e)
            {
                Result_Ob = new { result = 0, returnval = e.Message };
            }
            return Result_Ob;
        }  


        /// <summary>
        /// æ ¹æ®å•æ®å·æŸ¥æ‰¾ä¸Šä¼ æ–‡ä»¶åˆ—表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("Cj_StationInBill/Filelist")]
        [HttpGet]
        public object Filelist(string HBillNo)
        {
            var url = fileip + "/files/Cj_StationInBill/" + HBillNo + "/";
            //@"C:\\files\\"
            try
            {
                ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url  from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ ¹æ®ID,单据号,文件名 åˆ é™¤æ–‡ä»¶
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("Cj_StationInBill/DeleteFilelist")]
        [HttpGet]
        public object DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
        {
            try
            {

                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Cj_StationInBill/" + HSourceBillNo), HFileName);
                File.Delete(fileurl);      //删除指定文件
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
    }
}

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1950,7 +1950,7 @@
            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //备注
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
            string path = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
            //string path = @"D:\\Files\\"+ HBillNo;
            dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
            if (dyResult != null && dyResult.result == 1)
@@ -2006,7 +2006,7 @@
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/"+ HBillNo+"/"+ filename;
                    string StrPath = "/files/Cj_StationOutBill/" + HBillNo+"/"+ filename;
                    if (File.Exists(fileurl)) 
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
@@ -2029,7 +2029,7 @@
                {
                    Directory.CreateDirectory(fileSavePath); //添加文件夹
                    files.SaveAs(fileurl);
                    string StrPath = "/files/" + HBillNo + "/" + filename;
                    string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
@@ -2070,7 +2070,7 @@
            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //备注
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
            string path = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
            //string path = @"D:\\Files\\"+ HBillNo;
            dynamic dyResult = UpLoadFile1(files, path, HBillNo, HRemark, HUserName);
            if (dyResult != null && dyResult.result == 1)
@@ -2126,7 +2126,7 @@
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/" + HBillNo + "/" + filename;
                    string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
@@ -2149,7 +2149,7 @@
                {
                    Directory.CreateDirectory(fileSavePath); //添加文件夹
                    files.SaveAs(fileurl);
                    string StrPath = "/files/" + HBillNo + "/" + filename;
                    string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
@@ -2199,7 +2199,7 @@
        [HttpGet]
        public object Filelist(string HBillNo)
        {
            var url = fileip + "/files/" + HBillNo+"/";
            var url = fileip + "/files/Cj_StationOutBill/" + HBillNo+"/";
            //@"C:\\files\\"
            try
            {
@@ -2234,7 +2234,7 @@
            {

                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/" + HSourceBillNo), HFileName);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HSourceBillNo), HFileName);
                File.Delete(fileurl);      //删除指定文件
                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs

@@ -268,7 +268,6 @@

                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
@@ -816,5 +815,741 @@
        }
        #endregion     

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® æŸ¥è¯¢       
        [Route("Gy_MaterPreventErrMouldBill/getGy_EnvironmentTestSchemeBillMainList")]
        [HttpGet]
        public object getGy_EnvironmentTestSchemeBillMainList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillMainList order by å•æ®å· desc", "h_v_Gy_EnvironmentTestSchemeBillMainList");
                }
                else
                {
                    string sql1 = "select * from  h_v_Gy_EnvironmentTestSchemeBillMainList  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_EnvironmentTestSchemeBillMainList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® èŽ·å–编辑列表数据
        [Route("Gy_MaterPreventErrMouldBill/Gy_EnvironmentTestSchemeBillMainEditList")]
        [HttpGet]
        public object Gy_EnvironmentTestSchemeBillMainEditList(string HInterID, string User)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillMainList where HInterID = " + HInterID, " h_v_Gy_EnvironmentTestSchemeBillMainList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä¿å­˜/编辑      
        [Route("Gy_MaterPreventErrMouldBill/SaveGy_EnvironmentTestSchemeBillMain")]
        [HttpPost]
        public object SaveGy_EnvironmentTestSchemeBillMain([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();//操作方式数据类型 1添加 3修改 2 å¤åˆ¶
            string user = sArray[3].ToString();//用户名

            string UserName = "";
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //保存权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DAL.ClsGy_EnvironmentTestSchemeBillMain oBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
                List<Model.ClsGy_EnvironmentTestSchemeBillMain> lsmain = new List<Model.ClsGy_EnvironmentTestSchemeBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillMain(msg2);
                foreach (Model.ClsGy_EnvironmentTestSchemeBillMain oItem in lsmain)
                {
                    if (refSav == "Add")
                    {
                        //单据号是否重复
                        if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！不允许保存！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    if (refSav == "Update")
                    {
                        if (OBill.ShowBill(oItem.HInterID, ref s) == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据有误！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //判断是否可编辑
                        if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据已经被审核，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (OBill.omodel.HBillStatus > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }

                    }
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "7516";
                    oItem.HBillSubType = "7516";



                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                // è¡¨ä½“数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsGy_EnvironmentTestSchemeBillSub> ls = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();
                ls = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillSub(msg3);
                int i = 0;
                foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);

                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (refSav == "Add")
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (refSav == "Update")
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = false;
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® åˆ é™¤     
        [Route("Gy_MaterPreventErrMouldBill/DeleteGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object DeleteGy_EnvironmentTestSchemeBill(string HInterID, string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                oCN.RunProc("delete from Gy_EnvironmentTestSchemeBillMain where HInterID = " + HInterID);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å®¡æ ¸/反审核     
        [Route("Gy_MaterPreventErrMouldBill/AuditGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object AuditGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //审核单据
                        if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å…³é—­/反关闭功能
        [Route("Gy_MaterPreventErrMouldBill/CloseGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object CloseGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Close", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限关闭!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å…³é—­  2  åå…³é—­
                if (Type == 1)
                {
                    //判断单据是否已经关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //关闭单据
                        if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未关闭!不需要再反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反关闭单据
                        if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä½œåºŸ/反作废功能
        [Route("Gy_MaterPreventErrMouldBill/DropGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object DropGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有作废权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限作废!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 ä½œåºŸ  2  åä½œåºŸ
                if (Type == 1)
                {
                    //判断单据是否已经作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不需要再作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //作废单据
                        if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未作废!不需要再反作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反作废单据
                        if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion     

    }
}

 WebAPI/Controllers/CJGL/Sc_OEEReportController.cs

New file
@@ -0,0 +1,79 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
using System.IO;
using System.Web;
using WebAPI.Controllers.SCGL.日计划管理;

namespace WebAPI.Controllers
{
    //期初余额报表Controller
    public class Sc_OEEReportController : ApiController
    {
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        #region OEE报表 æŸ¥è¯¢
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_OEEReport/list")]
        [HttpGet]
        public object getSc_OEEReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ////查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_OEEReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "exec h_p_Sc_OEEReport " + sWhere;
                ds = oCN.RunProcReturn(sql, "h_p_Sc_OEEReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -1253,23 +1253,25 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //更改为存储过程执行
                //ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '日期',a.HBillType,x.HName å•æ®ç±»åž‹,a.HBillNo as '单据号',
                //    CASE WHEN a.HBillStatus <= 1 THEN '创建' WHEN a.HBillStatus = 2 THEN '已审核' WHEN a.HBillStatus = 3 AND 
                //    a.HCloseType = 0 THEN '自动关闭' WHEN a.HBillStatus = 3 AND 
                //    a.HCloseType = 1 THEN '手动关闭' WHEN a.HBillStatus = 4 THEN '已作废' ELSE '其它状态' END AS å•æ®çŠ¶æ€,
                //    a.HMaker AS åˆ¶å•äºº, a.HMakeDate AS åˆ¶å•æ—¥æœŸ,a.HChecker AS å®¡æ ¸äºº, a.HCheckDate AS å®¡æ ¸æ—¥æœŸ, a.HUpDater AS ä¿®æ”¹äºº, a.HUpDateDate AS ä¿®æ”¹æ—¥æœŸ, 
                //    a.HCloseMan AS å…³é—­äºº, a.HCloseDate AS å…³é—­æ—¥æœŸ, a.HDeleteMan AS ä½œåºŸäºº, a.HDeleteDate AS ä½œåºŸæ—¥æœŸ
                //    from (
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType  from Gy_EquipFileBillMain where HInterID = {HInterID} UNION ALL 
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipStockInCheckBillMain where HEquipID = {HInterID} UNION ALL
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipDotCheckBillMain where HEquipID = {HInterID} UNION ALL
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipMaintainBillMain where HEquipID = {HInterID} UNION ALL
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipRepairWorkBillMain where HEquipID = {HInterID} UNION ALL
                //    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipConkBookBillMain where HEquipID = {HInterID}
                //    )as a,Xt_BillType as x
                //    where a.HBillType = x.HNumber
                //    ORDER BY '日期' ASC;", "h_v_Gy_EquipFileMainList");

                ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '日期',a.HBillType,x.HName å•æ®ç±»åž‹,a.HBillNo as '单据号',
                    CASE WHEN a.HBillStatus <= 1 THEN '创建' WHEN a.HBillStatus = 2 THEN '已审核' WHEN a.HBillStatus = 3 AND 
                    a.HCloseType = 0 THEN '自动关闭' WHEN a.HBillStatus = 3 AND 
                    a.HCloseType = 1 THEN '手动关闭' WHEN a.HBillStatus = 4 THEN '已作废' ELSE '其它状态' END AS å•æ®çŠ¶æ€,
                    a.HMaker AS åˆ¶å•äºº, a.HMakeDate AS åˆ¶å•æ—¥æœŸ,a.HChecker AS å®¡æ ¸äºº, a.HCheckDate AS å®¡æ ¸æ—¥æœŸ, a.HUpDater AS ä¿®æ”¹äºº, a.HUpDateDate AS ä¿®æ”¹æ—¥æœŸ, 
                    a.HCloseMan AS å…³é—­äºº, a.HCloseDate AS å…³é—­æ—¥æœŸ, a.HDeleteMan AS ä½œåºŸäºº, a.HDeleteDate AS ä½œåºŸæ—¥æœŸ
                    from (
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType  from Gy_EquipFileBillMain where HInterID = {HInterID} UNION ALL 
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipStockInCheckBillMain where HEquipID = {HInterID} UNION ALL
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipDotCheckBillMain where HEquipID = {HInterID} UNION ALL
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipMaintainBillMain where HEquipID = {HInterID} UNION ALL
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipRepairWorkBillMain where HEquipID = {HInterID} UNION ALL
                    select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipConkBookBillMain where HEquipID = {HInterID}
                    )as a,Xt_BillType as x
                    where a.HBillType = x.HNumber
                    ORDER BY '日期' ASC;", "h_v_Gy_EquipFileMainList");
                ds = oCN.RunProcReturn("exec h_p_Gy_EquipFileReport '" + HInterID + "'", "h_p_Gy_EquipFileReport");

                //添加动态列信息
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1315,25 +1317,27 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //更改为存储过程执行
                //ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '日期',a.HBillType,x.HName å•æ®ç±»åž‹,a.HBillNo as '单据号',
                //CASE WHEN a.HBillStatus <= 1 THEN '创建' WHEN a.HBillStatus = 2 THEN '已审核' WHEN a.HBillStatus = 3 AND 
                //a.HCloseType = 0 THEN '自动关闭' WHEN a.HBillStatus = 3 AND 
                //a.HCloseType = 1 THEN '手动关闭' WHEN a.HBillStatus = 4 THEN '已作废' ELSE '其它状态' END AS å•æ®çŠ¶æ€,
                //a.HMaker AS åˆ¶å•äºº, a.HMakeDate AS åˆ¶å•æ—¥æœŸ,a.HChecker AS å®¡æ ¸äºº, a.HCheckDate AS å®¡æ ¸æ—¥æœŸ, a.HUpDater AS ä¿®æ”¹äºº, a.HUpDateDate AS ä¿®æ”¹æ—¥æœŸ, 
                //a.HCloseMan AS å…³é—­äºº, a.HCloseDate AS å…³é—­æ—¥æœŸ, a.HDeleteMan AS ä½œåºŸäºº, a.HDeleteDate AS ä½œåºŸæ—¥æœŸ
                //from (
                //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType  from Gy_MouldFileMain where HInterID = {HInterID} UNION ALL 
                //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldDotCheckBillMain where HMouldID = {HInterID} UNION ALL
                //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldMaintainBillMain where HMouldID = {HInterID} UNION ALL
                //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldRepairWorkBillMain  where HMouldID = {HInterID} UNION ALL
                //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldConkBookBillMain where HMouldID = {HInterID} UNION ALL
                //select a.HInterID,a.HDate,a.HBillType,a.HBillNo,a.HBillStatus,a.HMaker,a.HMakeDate,a.HChecker,a.HCheckDate,a.HUpDater,a.HUpDateDate,a.HCloseMan,a.HCloseDate,a.HDeleteMan,a.HDeleteDate,a.HCloseType 
                //from Sc_MouldStockBillMain as a,Sc_MouldStockBillSub as b 
                //where  a.HInterID = b.HInterID and b.HMaterID = {HInterID} and HBillType in ('3801','3829','3826','3831','3827')
                //)as a,Xt_BillType as x
                //where a.HBillType = x.HNumber
                //ORDER BY '日期' ASC;", "Gy_MouldFileResume");

                ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '日期',a.HBillType,x.HName å•æ®ç±»åž‹,a.HBillNo as '单据号',
                CASE WHEN a.HBillStatus <= 1 THEN '创建' WHEN a.HBillStatus = 2 THEN '已审核' WHEN a.HBillStatus = 3 AND 
                a.HCloseType = 0 THEN '自动关闭' WHEN a.HBillStatus = 3 AND 
                a.HCloseType = 1 THEN '手动关闭' WHEN a.HBillStatus = 4 THEN '已作废' ELSE '其它状态' END AS å•æ®çŠ¶æ€,
                a.HMaker AS åˆ¶å•äºº, a.HMakeDate AS åˆ¶å•æ—¥æœŸ,a.HChecker AS å®¡æ ¸äºº, a.HCheckDate AS å®¡æ ¸æ—¥æœŸ, a.HUpDater AS ä¿®æ”¹äºº, a.HUpDateDate AS ä¿®æ”¹æ—¥æœŸ, 
                a.HCloseMan AS å…³é—­äºº, a.HCloseDate AS å…³é—­æ—¥æœŸ, a.HDeleteMan AS ä½œåºŸäºº, a.HDeleteDate AS ä½œåºŸæ—¥æœŸ
                from (
                select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType  from Gy_MouldFileMain where HInterID = {HInterID} UNION ALL 
                select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldDotCheckBillMain where HMouldID = {HInterID} UNION ALL
                select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldMaintainBillMain where HMouldID = {HInterID} UNION ALL
                select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldRepairWorkBillMain  where HMouldID = {HInterID} UNION ALL
                select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldConkBookBillMain where HMouldID = {HInterID} UNION ALL
                select a.HInterID,a.HDate,a.HBillType,a.HBillNo,a.HBillStatus,a.HMaker,a.HMakeDate,a.HChecker,a.HCheckDate,a.HUpDater,a.HUpDateDate,a.HCloseMan,a.HCloseDate,a.HDeleteMan,a.HDeleteDate,a.HCloseType 
                from Sc_MouldStockBillMain as a,Sc_MouldStockBillSub as b 
                where  a.HInterID = b.HInterID and b.HMaterID = {HInterID} and HBillType in ('3801','3829','3826','3831','3827')
                )as a,Xt_BillType as x
                where a.HBillType = x.HNumber
                ORDER BY '日期' ASC;", "Gy_MouldFileResume");
                ds = oCN.RunProcReturn("exec h_p_Gy_MouldFileReport '" + HInterID + "'", "h_p_Gy_MouldFileReport");

                //添加动态列信息
                foreach (DataColumn col in ds.Tables[0].Columns)

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -938,6 +938,79 @@
        }
        #endregion

        #region æŠ¥å·¥å¹³å°å¼€å·¥å• åˆ·å¡ä¿å­˜åˆ·å¡äºº
        /// <summary>
        /// å¼€å·¥å•
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MESBeginWorkBill/AddHCardswiper")]
        [HttpPost]
        public object AddHCardswiper([FromBody] JObject msg)
        {

            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();

            ListModels oListModels = new ListModels();
            try
            {
                oCN.BeginTran();
                DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
                List<Models.ClsSc_MESBeginWorkBillSub> lsmain = new List<Models.ClsSc_MESBeginWorkBillSub>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub(msg2);

                foreach (Models.ClsSc_MESBeginWorkBillSub oItemSub in lsmain)
                {
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);
                }
                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HInterID<0 order by HInterID", "Sc_MESBeginWorkBillSub");
                string HInterID = "-1";
                if (ds.Tables[0].Rows.Count>0) {
                    HInterID = (int.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()) - 1).ToString();
                }
                //msg3 = msg3.Substring(1, msg3.Length - 2);
                //msg3 = msg3.Replace("\\", "");
                //msg3 = msg3.Replace("\n", "");  //\n

                //保存
                foreach (Models.ClsSc_MESBeginWorkBillSub oSub in oBill.DetailColl)
                {
                    ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HBillNo_bak='" + oSub.HBillNo_bak + "'", "Sc_MESBeginWorkBillSub");
                    string subSql = "insert into Sc_MESBeginWorkBillSub " +
                        "(HInterID, HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType, HSourceInterID, HSourceEntryID" +
                        ",HRelationQty,HRelationMoney, HSourceBillNo, HSourceBillType, HRemark,HCardswiperMan,HCardswiperDate,HEmpID) " +
                        "values(" +
                        "'" + HInterID + "','" + (ds.Tables[0].Rows.Count + 1) + "','" + oSub.HBillNo_bak + "','','" + oSub.HEntryCloseDate + "','" + oSub.HCloseType + "','',''," +
                        "0,0,'','','','" + oSub.HCardswiperMan + "',getdate(),'" + oSub.HEmpID + "')";
                    oCN.RunProc(subSql);
                }
                oCN.Commit();

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message;
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        public DataTable getInfodatanow(string hsoucreID)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

 WebAPI/Controllers/WebAPIController.cs

@@ -36,6 +36,9 @@
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
        //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();

        string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];

        /// <summary>
        /// é€è´§å•è¡¨å¤´ä¿¡æ¯
        /// </summary>
@@ -5292,6 +5295,188 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ–‡ä»¶ä¸Šä¼ 
        /// </summary>
        /// <returns></returns>
        [Route("Gy_InspectInstruMent_UploadFile")]
        [HttpPost]
        public object Gy_InspectInstruMent_UploadFile()
        {

            string HBillNo = HttpContext.Current.Request.Params["HBillNo"];  //单据号
            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //备注
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_InspectInstruMent/" + HBillNo);
            //string path = @"D:\\Files\\"+ HBillNo;
            dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
            if (dyResult != null && dyResult.result == 1)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "上传成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = dyResult.returnval;
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
        {
            dynamic Result_Ob = new { result = 1, returnval = "上传成功！" };
            string filePath = Path.GetFullPath(files.FileName);//文件上传路径
            string fileExtension = Path.GetExtension(files.FileName);// æ–‡ä»¶æ‰©å±•å
            string filename = files.FileName;//文件名
            string fileSavePath = path;// ä¸Šä¼ ä¿å­˜è·¯å¾„
            int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
            int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M
            try
            {
                if (files == null || files.ContentLength <= 0)
                {
                    Result_Ob = new { result = 0, returnval = "文件不能为空!" };
                    return Result_Ob;
                }
                if (filesize >= Maxsize)
                {
                    Result_Ob = new { result = 0, returnval = "上传文件超过40M，不能上传！" };
                    return Result_Ob;
                }

                string fileurl = Path.Combine(fileSavePath, filename);
                if (Directory.Exists(fileurl) == true)  //如果存在重名文件就提示  
                {
                    Result_Ob = new { result = 0, returnval = "存在同名文件！" };
                    return Result_Ob;
                }
                //删除数据表数据
                ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
                if (Directory.Exists(path))
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Gy_InspectInstruMent/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
                    }
                }
                else
                {
                    Directory.CreateDirectory(fileSavePath); //添加文件夹
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Gy_InspectInstruMent/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
                    }
                }

            }
            catch (Exception e)
            {
                Result_Ob = new { result = 0, returnval = e.Message };
            }
            return Result_Ob;
        }

        /// <summary>
        /// æ ¹æ®å•æ®å·æŸ¥æ‰¾ä¸Šä¼ æ–‡ä»¶åˆ—表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("Gy_InspectInstruMent_Filelist")]
        [HttpGet]
        public object Gy_InspectInstruMent_Filelist(string HBillNo)
        {
            var url = fileip + "/files/Gy_InspectInstruMent/" + HBillNo + "/";
            //@"C:\\files\\"
            try
            {
                ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url  from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ ¹æ®ID,单据号,文件名 åˆ é™¤æ–‡ä»¶
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("Gy_InspectInstruMent_DeleteFilelist")]
        [HttpGet]
        public object Gy_InspectInstruMent_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
        {
            try
            {

                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/EquipTechParamFolder/" + HSourceBillNo), HFileName);
                File.Delete(fileurl);      //删除指定文件
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  æ£€éªŒä¾æ®  è®¾ç½®åˆ—表/保存/编辑/删除方法

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1451,7 +1451,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillEdit where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs

@@ -37,7 +37,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillEdit where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_StepFoldOutBillController.cs

@@ -246,9 +246,10 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
        //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
        string s = "";
                int sYear = 0;
                int sPeriod = 0;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
@@ -267,12 +268,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1250 + "','" +
                    1250 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -300,7 +301,7 @@
                    String sql="update Kf_ICStockBillMain   set " +
                                    "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;

                    oCn.RunProc(sql);
                    //删除子表

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÑéÊÕÈë¿â/Kf_StepFoldinBillController.cs

@@ -258,6 +258,7 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
@@ -279,12 +280,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1251 + "','" +
                    1251 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -311,7 +312,7 @@
                    String sql = "update Kf_ICStockBillMain   set " +
                               "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;

                    oCN.RunProc(sql);


 WebAPI/Controllers/Æ·ÖʹÜÀí/»ù´¡×ÊÁÏ/Gy_BaseInformationController.cs

New file
@@ -0,0 +1,764 @@
using DBUtility;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;

namespace WebAPI.Controllers.品质管理
{
    public class Gy_BaseInformationController : ApiController
    {
        //质量管理的全部基础资料方法
        
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态（新增，修改，浏览，更新单价，变更）
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        public DAL.ClsGy_EnvironmentTestSchemeBillMain OBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
        public DAL.ClsGy_EnvironmentTestSchemeBillMain BillOld = new DAL.ClsGy_EnvironmentTestSchemeBillMain();

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® æŸ¥è¯¢       
        [Route("Gy_BaseInformation/getGy_EnvironmentTestSchemeBillMainList")]
        [HttpGet]
        public object getGy_EnvironmentTestSchemeBillMainList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillList order by å•æ®å· desc", "h_v_Gy_EnvironmentTestSchemeBillList");
                }
                else
                {
                    string sql1 = "select * from  h_v_Gy_EnvironmentTestSchemeBillList  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_EnvironmentTestSchemeBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® èŽ·å–编辑列表数据
        [Route("Gy_BaseInformation/Gy_EnvironmentTestSchemeBillMainEditList")]
        [HttpGet]
        public object Gy_EnvironmentTestSchemeBillMainEditList(string linterid, string user)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (linterid == null || linterid.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillEdit where HInterID = " + linterid, " h_v_Gy_EnvironmentTestSchemeBillEdit");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä¿å­˜/编辑      
        [Route("Gy_BaseInformation/SaveGy_EnvironmentTestSchemeBillMain")]
        [HttpPost]
        public object SaveGy_EnvironmentTestSchemeBillMain([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();//操作方式数据类型 1添加 3修改 2 å¤åˆ¶
            string user = sArray[3].ToString();//用户名

            string UserName = "";
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //保存权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DAL.ClsGy_EnvironmentTestSchemeBillMain oBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
                List<Model.ClsGy_EnvironmentTestSchemeBillMain> lsmain = new List<Model.ClsGy_EnvironmentTestSchemeBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillMain(msg2);
                foreach (Model.ClsGy_EnvironmentTestSchemeBillMain oItem in lsmain)
                {
                    if (refSav == "Add")
                    {
                        //单据号是否重复
                        if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！不允许保存！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    if (refSav == "Update")
                    {
                        if (OBill.ShowBill(oItem.HInterID, ref s) == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据有误！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //判断是否可编辑
                        if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据已经被审核，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (OBill.omodel.HBillStatus > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }

                    }
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "7516";
                    oItem.HBillSubType = "7516";



                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                // è¡¨ä½“数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsGy_EnvironmentTestSchemeBillSub> ls = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();
                ls = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillSub(msg3);
                int i = 0;
                foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);

                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (refSav == "Add")
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (refSav == "Update")
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = false;
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® åˆ é™¤     
        [Route("Gy_BaseInformation/DeleteGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object DeleteGy_EnvironmentTestSchemeBill(string HInterID, string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                oCN.RunProc("delete from Gy_EnvironmentTestSchemeBillMain where HInterID = " + HInterID);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å®¡æ ¸/反审核     
        [Route("Gy_BaseInformation/AuditGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object AuditGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //审核单据
                        if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å…³é—­/反关闭功能
        [Route("Gy_BaseInformation/CloseGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object CloseGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Close", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限关闭!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å…³é—­  2  åå…³é—­
                if (Type == 1)
                {
                    //判断单据是否已经关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //关闭单据
                        if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未关闭!不需要再反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反关闭单据
                        if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä½œåºŸ/反作废功能
        [Route("Gy_BaseInformation/DropGy_EnvironmentTestSchemeBill")]
        [HttpGet]
        public object DropGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有作废权限
                if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限作废!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 ä½œåºŸ  2  åä½œåºŸ
                if (Type == 1)
                {
                    //判断单据是否已经作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不需要再作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //作废单据
                        if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未作废!不需要再反作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反作废单据
                        if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion     

    }
}

 WebAPI/Controllers/Æ·ÖʹÜÀí/»·¾³¼ì²âµ¥/QC_EnvironmentTestDotCheckBillController.cs

New file
@@ -0,0 +1,763 @@
using DBUtility;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;

namespace WebAPI.Controllers.品质管理
{
    public class QC_EnvironmentTestDotCheckBillController : ApiController
    {
        //环境检测单
        
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态（新增，修改，浏览，更新单价，变更）
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        public DAL.ClsQC_EnvironmentTestDotCheckBillMain OBill = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();
        public DAL.ClsQC_EnvironmentTestDotCheckBillMain BillOld = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® æŸ¥è¯¢       
        [Route("QC_EnvironmentTestDotCheckBill/getQC_EnvironmentTestDotCheckBillMainList")]
        [HttpGet]
        public object getQC_EnvironmentTestDotCheckBillMainList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("QC_EnvironmentTestDotCheckBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_EnvironmentTestDotCheckBillList order by å•æ®å· desc", "h_v_QC_EnvironmentTestDotCheckBillList");
                }
                else
                {
                    string sql1 = "select * from  h_v_QC_EnvironmentTestDotCheckBillList  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_EnvironmentTestDotCheckBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® èŽ·å–编辑列表数据
        [Route("QC_EnvironmentTestDotCheckBill/QC_EnvironmentTestDotCheckBillMainEditList")]
        [HttpGet]
        public object QC_EnvironmentTestDotCheckBillMainEditList(string linterid, string user)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (linterid == null || linterid.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_QC_EnvironmentTestDotCheckBillEdit where HInterID = " + linterid, " h_v_QC_EnvironmentTestDotCheckBillEdit");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä¿å­˜/编辑      
        [Route("QC_EnvironmentTestDotCheckBill/SaveQC_EnvironmentTestDotCheckBillMain")]
        [HttpPost]
        public object SaveQC_EnvironmentTestDotCheckBillMain([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string refSav = sArray[2].ToString();//操作方式数据类型 1添加 3修改 2 å¤åˆ¶
            string user = sArray[3].ToString();//用户名

            string UserName = "";
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //保存权限
                if (!DBUtility.ClsPub.Security_Log_second("QC_EnvironmentTestDotCheckBillMain_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DAL.ClsQC_EnvironmentTestDotCheckBillMain oBill = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();
                List<Model.ClsQC_EnvironmentTestDotCheckBillMain> lsmain = new List<Model.ClsQC_EnvironmentTestDotCheckBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_QC_EnvironmentTestDotCheckBillMain(msg2);
                foreach (Model.ClsQC_EnvironmentTestDotCheckBillMain oItem in lsmain)
                {
                    if (refSav == "Add")
                    {
                        //单据号是否重复
                        if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！不允许保存！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    if (refSav == "Update")
                    {
                        if (OBill.ShowBill(oItem.HInterID, ref s) == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据有误！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //判断是否可编辑
                        if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据已经被审核，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (OBill.omodel.HBillStatus > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }

                    }
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "7524";
                    oItem.HBillSubType = "7524";



                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                // è¡¨ä½“数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsQC_EnvironmentTestDotCheckBillSub> ls = new List<Model.ClsQC_EnvironmentTestDotCheckBillSub>();
                ls = oListModels.getObjectByJson_QC_EnvironmentTestDotCheckBillSub(msg3);
                int i = 0;
                foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型

                    oBill.DetailColl.Add(oItemSub);

                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (refSav == "Add")
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (refSav == "Update")
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = false;
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® åˆ é™¤     
        [Route("QC_EnvironmentTestDotCheckBill/DeleteQC_EnvironmentTestDotCheckBill")]
        [HttpGet]
        public object DeleteQC_EnvironmentTestDotCheckBill(string HInterID, string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                oCN.RunProc("delete from QC_EnvironmentTestDotCheckBillMain where HInterID = " + HInterID);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å®¡æ ¸/反审核     
        [Route("QC_EnvironmentTestDotCheckBill/AuditQC_EnvironmentTestDotCheckBill")]
        [HttpGet]
        public object AuditQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //审核单据
                        if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行反审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® å…³é—­/反关闭功能
        [Route("QC_EnvironmentTestDotCheckBill/CloseQC_EnvironmentTestDotCheckBill")]
        [HttpGet]
        public object CloseQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Close", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限关闭!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 å…³é—­  2  åå…³é—­
                if (Type == 1)
                {
                    //判断单据是否已经关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //关闭单据
                        if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反关闭
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未关闭!不需要再反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反关闭单据
                        if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹é¡¹ç›® ä½œåºŸ/反作废功能
        [Route("QC_EnvironmentTestDotCheckBill/DropQC_EnvironmentTestDotCheckBill")]
        [HttpGet]
        public object DropQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有作废权限
                if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限作废!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
                oCN.BeginTran();//开始事务

                //Type 1 ä½œåºŸ  2  åä½œåºŸ
                if (Type == 1)
                {
                    //判断单据是否已经作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不需要再作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //作废单据
                        if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反作废
                    DataSet ds;
                    string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未作废!不需要再反作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反作废单据
                        if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion     

    }
}

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -1606,13 +1606,13 @@
        //点击主表格的流转卡,查询子表格数据
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_Right(string linterid,string SNs, string user)
        public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");

                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
@@ -1842,15 +1842,24 @@

        [Route("QC_CustomerAppealReport/Get_TechParamList")]
        [HttpGet]
        public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string user)
        public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string HTeachName, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("select c.HName å·¥è‰ºå‚æ•°,b.HDataForm é‡‡é›†æ¥æº from Gy_MaterialTechParamBillMain a " +
                if (HTeachName=="")
                {
                    ds = oCN.RunProcReturn("select c.HName å·¥è‰ºå‚æ•°,b.HDataForm é‡‡é›†æ¥æº from Gy_MaterialTechParamBillMain a " +
                    "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
                    "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='"+ HProID + "' and a.HEquipID='"+ HEquId + "'", "SB_EquipICMOTechParamBillMain");
                    "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "'", "SB_EquipICMOTechParamBillMain");
                }
                else
                {
                    ds = oCN.RunProcReturn("select c.HName å·¥è‰ºå‚æ•°,b.HDataForm é‡‡é›†æ¥æº from Gy_MaterialTechParamBillMain a " +
                    "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
                    "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "' and c.HName ='" + HTeachName + "'", "SB_EquipICMOTechParamBillMain");
                }                
                
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {

 WebAPI/Controllers/ÌõÂë¹ÜÀí/MouldController.cs

@@ -226,7 +226,7 @@
        /// <returns></returns>
        [Route("MouldController/set_DelMouldStockBillMain_Temp_Json")]
        [HttpGet]
        public object set_DelPonderationBillMain_Temp_BarCode_Json(Int64 HInterID, string HBillType, string HBarCode)
        public object set_DelMouldStockBillMain_Temp_Json(Int64 HInterID, string HBillType, string HBarCode)
        {
            try
            {

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -1072,6 +1072,90 @@

        #region æ‰«ç æ¨¡å—调用方法

        #region å…¶ä»–入库    èŽ·å–入库类型

        /// <summary>
        /// èŽ·å–入库类型
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetStockInStyle_Json")]
        [HttpGet]
        public Object GetStockInStyle_Json()
        {
            try
            {
                ds = oWebs.get_StockInStyle();
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询不到入库类型信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取入库类型信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region å…¶ä»–出库    èŽ·å–出库类型

        /// <summary>
        /// èŽ·å–出库类型
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetStockOutStyle_Json")]
        [HttpGet]
        public Object GetStockOutStyle_Json()
        {
            try
            {
                ds = oWebs.get_StockOutStyle();
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询不到出库类型信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取出库类型信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region ç›´æŽ¥è°ƒæ‹¨    èŽ·å–调拨出货类型

        /// <summary>
@@ -1396,6 +1480,50 @@
        }

        #endregion


        #region æ‰«ç æ¨¡å—    å®¢æˆ·ã€ä¼ ç¥¨ã€æ¡ç éªŒè¯è°ƒç”¨

        /// <summary>
        /// æ‰«ç æ¨¡å—    å®¢æˆ·ã€ä¼ ç¥¨ã€æ¡ç éªŒè¯è°ƒç”¨
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetCheakBarCodeAndCP_Json")]
        [HttpGet]
        public object GetCheakBarCodeAndCP_Json(long HCusID, string HCP, string HBarCode)
        {
            try
            {
                HBarCode = HBarCode.Trim();
                if (oWebs.Get_CheakBarCodeAndCP(HCusID, HCP, HBarCode, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "客户、传票、条码验证失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion


        #endregion

@@ -4964,7 +5092,15 @@
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    objJsonResult.data = new
                    {
                        Materlist = ds.Tables[0],           //返回物料明细列表信息（0）
                        Mouldlist = ds.Tables[1],           //返回模治具列表信息（1）
                        FIFOlist = ds.Tables[2],            //返回先进先出列表信息（2）
                        BarCodelist = ds.Tables[3],         //返回条码明细列表信息（3）
                        ICMOReportlist = ds.Tables[4],      //返回源单生产汇报单条码明细列表信息（4）
                        BarCodeDetailslist = ds.Tables[5]   //返回当前所扫描条码明细信息（5）
                    };
                    return objJsonResult;
                }
                else

 WebAPI/ListModels.cs

@@ -1197,7 +1197,7 @@
        }

        /// <summary>
        /// å¤„理新增环境检测单表的json   
        /// å¤„理新增环境检测项目表的json   
        /// </summary>
        /// <param name="jsonString"></param> 
        /// <returns></returns>
@@ -3006,6 +3006,56 @@
        }

        /// <summary>
        /// å¤„理新增环境检测方案主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_EnvironmentTestSchemeBillMain> getObjectByJson_Gy_EnvironmentTestSchemeBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_EnvironmentTestSchemeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestSchemeBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// å¤„理新增环境检测方案子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_EnvironmentTestSchemeBillSub> getObjectByJson_Gy_EnvironmentTestSchemeBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_EnvironmentTestSchemeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestSchemeBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// å¤„理新增环境检测单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_EnvironmentTestDotCheckBillMain> getObjectByJson_QC_EnvironmentTestDotCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_EnvironmentTestDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_EnvironmentTestDotCheckBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// å¤„理新增环境检测单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_EnvironmentTestDotCheckBillSub> getObjectByJson_QC_EnvironmentTestDotCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_EnvironmentTestDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_EnvironmentTestDotCheckBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// å¤„理新增防错验证检查主表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -3422,6 +3472,18 @@
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_MESBeginWorkBillSub> getObjectByJson_Sc_MESBeginWorkBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_MESBeginWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// æŠ¥å·¥å¹³å°å¼€å·¥å•å­è¡¨json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";

 WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs

@@ -5,7 +5,9 @@
namespace WebAPI.Models
{
    public class ClsSc_MESBeginWorkBillSub : DBUtility.ClsXt_BaseBillSub
    { 
        
    {
        public string HCardswiperMan { get; set; }
        public DateTime HCardswiperDate { get; set; }
        public long HEmpID { get; set; }
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-20T02:16:03.7893118Z;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <History>True|2024-12-02T06:57:10.0773563Z;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/11/2024 16:52:40</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/11/2024 16:52:40</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/11/2024 16:52:36</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/11/2024 16:52:36</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/04/2024 14:38:08</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/04/2024 14:38:08</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/11/2024 16:52:30</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/11/2024 16:52:30</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/04/2024 14:38:05</publishTime>
      <publishTime>11/26/2024 08:23:53</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/04/2024 14:38:05</publishTime>
      <publishTime>11/26/2024 08:23:53</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/04/2024 14:38:07</publishTime>
      <publishTime>11/26/2024 08:23:55</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/04/2024 14:38:03</publishTime>
      <publishTime>11/26/2024 08:23:52</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/04/2024 14:38:03</publishTime>
      <publishTime>11/26/2024 08:23:52</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/11/2024 16:52:35</publishTime>
      <publishTime>11/26/2024 08:23:57</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/11/2024 16:52:35</publishTime>
      <publishTime>11/26/2024 08:23:57</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/20/2024 10:15:54</publishTime>
      <publishTime>12/02/2024 14:57:01</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/20/2024 10:15:54</publishTime>
      <publishTime>12/02/2024 14:57:01</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>11/20/2024 10:16:02</publishTime>
      <publishTime>12/02/2024 14:57:08</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/11/2024 16:53:32</publishTime>
      <publishTime>11/26/2024 08:24:30</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-28T02:42:45.3823067Z;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2024-12-04T01:52:03.8506923Z;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/28/2024 16:06:48</publishTime>
      <publishTime>12/04/2024 09:51:28</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/28/2024 16:06:48</publishTime>
      <publishTime>12/04/2024 09:51:28</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/28/2024 16:06:46</publishTime>
      <publishTime>12/04/2024 09:51:25</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/28/2024 16:06:46</publishTime>
      <publishTime>12/04/2024 09:51:25</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/28/2024 16:06:40</publishTime>
      <publishTime>12/04/2024 09:51:19</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/28/2024 16:06:40</publishTime>
      <publishTime>12/04/2024 09:51:19</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/28/2024 16:06:42</publishTime>
      <publishTime>12/04/2024 09:51:20</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/28/2024 16:06:42</publishTime>
      <publishTime>12/04/2024 09:51:20</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/28/2024 16:06:38</publishTime>
      <publishTime>12/04/2024 09:51:17</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/28/2024 16:06:38</publishTime>
      <publishTime>12/04/2024 09:51:17</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/28/2024 16:06:39</publishTime>
      <publishTime>12/04/2024 09:51:18</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/28/2024 16:06:39</publishTime>
      <publishTime>12/04/2024 09:51:18</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/28/2024 16:06:39</publishTime>
      <publishTime>12/04/2024 09:51:18</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/28/2024 16:06:39</publishTime>
      <publishTime>12/04/2024 09:51:18</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/28/2024 16:04:36</publishTime>
      <publishTime>12/04/2024 09:47:01</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/28/2024 16:04:36</publishTime>
      <publishTime>12/04/2024 09:47:01</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/28/2024 16:04:42</publishTime>
      <publishTime>12/04/2024 09:47:07</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/28/2024 16:04:42</publishTime>
      <publishTime>12/04/2024 09:47:07</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/28/2024 16:07:25</publishTime>
      <publishTime>12/04/2024 09:52:01</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/28/2024 16:07:25</publishTime>
      <publishTime>12/04/2024 09:52:01</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/15/2024 15:51:40</publishTime>
      <publishTime>12/03/2024 15:09:47</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-11-25T05:45:07.6935933Z;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
    <History>True|2024-12-03T07:16:04.1754554Z;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/21/2024 17:41:49</publishTime>
      <publishTime>12/02/2024 16:31:07</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/21/2024 17:41:49</publishTime>
      <publishTime>12/02/2024 16:31:07</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/21/2024 17:41:47</publishTime>
      <publishTime>12/02/2024 16:31:05</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/21/2024 17:41:47</publishTime>
      <publishTime>12/02/2024 16:31:05</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/19/2024 14:12:48</publishTime>
      <publishTime>12/02/2024 16:31:03</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/19/2024 14:12:48</publishTime>
      <publishTime>12/02/2024 16:31:03</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/21/2024 17:41:44</publishTime>
      <publishTime>12/02/2024 16:31:03</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/21/2024 17:41:44</publishTime>
      <publishTime>12/02/2024 16:31:03</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/19/2024 14:12:46</publishTime>
      <publishTime>12/02/2024 16:31:01</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/19/2024 14:12:46</publishTime>
      <publishTime>12/02/2024 16:31:01</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/19/2024 14:12:47</publishTime>
      <publishTime>12/02/2024 16:31:02</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/19/2024 14:12:47</publishTime>
      <publishTime>12/02/2024 16:31:02</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/19/2024 14:12:47</publishTime>
      <publishTime>12/02/2024 16:31:02</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/19/2024 14:12:47</publishTime>
      <publishTime>12/02/2024 16:31:02</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/19/2024 10:11:11</publishTime>
      <publishTime>12/02/2024 16:27:25</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/19/2024 10:11:11</publishTime>
      <publishTime>12/02/2024 16:27:32</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/21/2024 16:43:30</publishTime>
      <publishTime>12/02/2024 16:27:07</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/21/2024 16:43:30</publishTime>
      <publishTime>12/02/2024 16:27:07</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/25/2024 13:44:55</publishTime>
      <publishTime>12/03/2024 15:15:52</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/25/2024 13:44:55</publishTime>
      <publishTime>12/03/2024 15:15:52</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/12/2024 17:24:04</publishTime>
      <publishTime>12/02/2024 16:31:20</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Web.config

@@ -35,7 +35,7 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />-->    <!--翁涛涛本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        

 WebAPI/WebAPI.csproj

@@ -439,6 +439,7 @@
    <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
    <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
    <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
    <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
    <Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
@@ -451,6 +452,8 @@
    <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
    <Compile Include="Controllers\人事管理\人员履历\HR_PersonnelResumeController.cs" />
    <Compile Include="Controllers\仓存管理\Kf_MoveStockBillController.cs" />
    <Compile Include="Controllers\品质管理\基础资料\Gy_BaseInformationController.cs" />
    <Compile Include="Controllers\品质管理\环境检测单\QC_EnvironmentTestDotCheckBillController.cs" />
    <Compile Include="Controllers\品质管理\质量月度目标单\QC_MonthTarGetBillController.cs" />
    <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />

 WebAPI/WebAPI.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 WorkM/bin/Release/BLL.dll

Binary files differ

 WorkM/bin/Release/BLL.pdb

Binary files differ

 WorkM/bin/Release/DAL.dll

Binary files differ

 WorkM/bin/Release/DAL.pdb

Binary files differ

 WorkM/bin/Release/DBUtility.dll

Binary files differ

 WorkM/bin/Release/DBUtility.pdb

Binary files differ

 WorkM/bin/Release/Model.dll

Binary files differ

 WorkM/bin/Release/Model.pdb

Binary files differ

 WorkM/bin/Release/Pub_Class.dll

Binary files differ

 WorkM/bin/Release/Pub_Class.pdb

Binary files differ

 WorkM/bin/Release/Pub_Control.dll

Binary files differ

 WorkM/bin/Release/Pub_Control.pdb

Binary files differ

 WorkM/bin/Release/SQLHelper.dll

Binary files differ

 WorkM/bin/Release/SQLHelper.pdb

Binary files differ

 WorkM/bin/Release/WarM.dll

Binary files differ

 WorkM/bin/Release/WarM.pdb

Binary files differ

 WorkM/bin/Release/WorkM.dll

Binary files differ

 WorkM/bin/Release/WorkM.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -1,6 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
>>>>>>> b75c484393ae95535edada81e805d05c56652931

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ