1

zrg

2024-09-13 73b70e9ebabbb3d9d81081f8c95de21373083d4b

1

 DAL/DAL.csproj

@@ -706,6 +706,7 @@
    <Compile Include="车间管理\ClsSc_StationInBill.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBill.cs" />
    <Compile Include="车间管理\ClsWW_EntrustWorkOrderBill.cs" />
    <Compile Include="车间管理\ClsCj_CenterCheckBill.cs" />
    <Compile Include="采购管理\ClsCg_ContractBill.cs">
      <SubType>Code</SubType>
    </Compile>

 DAL/³µ¼ä¹ÜÀí/ClsCj_CenterCheckBill.cs

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

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

        public ClsCj_CenterCheckBill()
        {
            base.MvarItemKeySub = "Cj_CenterCheckBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey= "Cj_CenterCheckBillMain";
            base.MvarReportTitle="中检单";
            base.BillType="1502";
            base.HBillSubType = "1502";

        }

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

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

                //oCn.BeginTran();
                ////更新主表
                //oCn.RunProc("UpDate Xs_SeOrderBillMain set  " +
                //" HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                //",HDate='" + omodel.HDate + "'" +
                //",HYear='" + omodel.HYear.ToString() + "'" +
                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                //",HRemark='" + omodel.HRemark + "'" +
                //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                //",HUpDateDate=getdate()" +
                ////========================================
                //",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
                //",HAddress='" + omodel.HAddress + "'" +
                //",HSSID=" + omodel.HSSID.ToString() +
                //",HSellSID=" + omodel.HSellSID.ToString() +
                //",HCusID=" + omodel.HCusID.ToString() +
                //",HCurID=" + omodel.HCurID.ToString() +
                //",HExRate=" + omodel.HExRate.ToString() +
                //",HEmpID=" + omodel.HEmpID.ToString() +
                //",HManagerID=" + omodel.HManagerID.ToString() +
                //",HDeptID=" + omodel.HDeptID.ToString() +
                //",HExplanation='" + omodel.HExplanation + "'" +
                //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                //" where HInterID=" + lngBillKey.ToString());

                ////保存前控制=========================================
                //string HBillNote = "";
                //DataSet ds = oCn.RunProcReturn("Exec h_p_Xs_SeOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Xs_SeOrderBill_BeforeSaveCtrl");
                //if (ds == null)
                //{
                //    sReturn = "保存前判断失败！";
                //    return false;
                //}
                //if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                //{
                //    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                //    return false;
                //}
                ////=========================================================

                //oCn.BeginTran();
                //string mainSql = "UpDate Xs_SeOrderBillMain set  " +
                //" HBillSubType='" + omodel.HBillSubType + "'" +
                //",HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                //",HDate='" + omodel.HDate + "'" +
                //",HYear='" + omodel.HYear.ToString() + "'" +
                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                //",HRemark='" + omodel.HRemark + "'" +
                //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                //",HUpDateDate=getdate()" +
                ////========================================
                //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                //",HAddress='" + omodel.HAddress + "'" +
                //",HDeptID=" + omodel.HDeptID.ToString() +
                //",HCusID=" + omodel.HCusID.ToString() +
                //",HEmpID=" + omodel.HEmpID.ToString() +
                //",HCurID=" + omodel.HCurID.ToString() +
                //",HExRate=" + omodel.HExRate.ToString() +
                //",HEarnestRate=" + omodel.HEarnestRate.ToString() +
                //",HManagerID=" + omodel.HManagerID.ToString() +
                //",HSellSID=" + omodel.HSellSID.ToString() +
                //",HSSID=" + omodel.HSSID.ToString() +
                //",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
                //",HPayCusID=" + omodel.HPayCusID +
                //",HExplanation='" + omodel.HExplanation + "'" +
                //",HLinkMan='" + omodel.HLinkMan + "'" +
                //",HWHID='" + omodel.HWHID + "'" +
                //",HProjectID='" + omodel.HProjectID + "'" +
                //",HLinkPhone='" + omodel.HLinkPhone + "'" +
                //" where HInterID=" + lngBillKey.ToString();

                //oCn.RunProc(mainSql);
                ////删除关联
                //DeleteRelation(ref sReturn, lngBillKey);
                ////删除子表
                //DeleteBillSub(lngBillKey);
                ////插入子表
                //omodel.HInterID = lngBillKey;
                //foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
                //{
                //    //oCn.RunProc("Insert into Xs_SeOrderBillSub " +
                //    //  " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                //    //  ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                //    //  ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxRate" +
                //    //  ",HTaxMoney,HlineTotal,HlineTotalBB,HDate" +
                //    //  ",HTaxPrice,HDiscountRate,HRelTaxPrice,HOutStockQty,HInvoiceQty" +
                //    //  ") values("
                //    //  + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                //    //  "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                //    //  "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HTaxRate.ToString() +
                //    //  "," + oSub.HTaxMoney.ToString() + "," + oSub.HlineTotal.ToString() + "," + oSub.HlineTotalBB.ToString() + ",'" + oSub.HDate.ToShortDateString() + "'" +
                //    //  "," + oSub.HTaxPrice.ToString() + "," + oSub.HDiscountRate.ToString() + "," + oSub.HRelTaxPrice.ToString() + "," + oSub.HOutStockQty.ToString() + "," + oSub.HInvoiceQty.ToString() + 
                //    //  ") ");

                //    string subSql = "Insert into Xs_SeOrderBillSub" +
                //        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationQty_SellOutCheck,HRelationMoney_SellOutCheck,HRelationQty_ICMO,HRelationQty_SellBack,HRelationQty_SellBackCheck,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                //        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
                //        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods,HWHID,HRemark_TL,HRemark_SJG) " +
                //        "values(" +
                //        "" + omodel.HInterID +
                //        "," + oSub.HEntryID +
                //        "," + oSub.HSourceInterID +
                //        "," + oSub.HSourceEntryID +
                //        ",'" + (oSub.HSourceBillNo == null ? "" : oSub.HSourceBillNo) +
                //        "','" + (oSub.HSourceBillType == null ? "" : oSub.HSourceBillType) +
                //        "'," + oSub.HRelationQty +
                //        "," + oSub.HRelationQty_SellOutCheck +
                //        "," + oSub.HRelationMoney_SellOutCheck +
                //        "," + oSub.HRelationQty_ICMO +
                //        "," + oSub.HRelationQty_SellBack +
                //        "," + oSub.HRelationQty_SellBackCheck +
                //        "," + oSub.HRelationMoney +
                //        "," + oSub.HMaterID +
                //        "," + oSub.HUnitID +
                //        "," + oSub.HQty +
                //        "," + oSub.HPrice +
                //        "," + oSub.HTaxPrice +
                //        "," + oSub.HMoney +
                //        "," + oSub.HDiscountRate +
                //        "," + oSub.HRelTaxPrice +
                //        "," + oSub.HTaxRate +
                //        "," + oSub.HTaxMoney +
                //        "," + oSub.HlineTotal +
                //        "," + oSub.HlineTotalBB +
                //        ",'" + oSub.HDate +
                //        "'," + oSub.HOutStockQty +
                //        "," + oSub.HInvoiceQty + 
                //        ",'" + oSub.HRemark +
                //        "','" + oSub.HOrderLevID +
                //        "','" + oSub.HCusMaterNumber +
                //        "','" + oSub.HCusModel +
                //        "','" + oSub.HCusMaterName +
                //        "'," + (oSub.HisStockGoods?1:0) +
                //         ",'" + oSub.HWhID + "'" +
                //         ",'" + oSub.HRemark_TL + "'" +
                //         ",'" + oSub.HRemark_SJG + "'" +
                //        ")";
                //    oCn.RunProc(subSql);
                //}

                ////=========================保存后控制  
                //DataSet ds2 = oCn.RunProcReturn("h_p_Xs_SeOrderBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Xs_SeOrderBill_AfterSaveCtrl");
                //if (ds2 == null)
                //{
                //    sReturn = "保存后控制判断失败！";
                //    oCn.RollBack();
                //    return false;
                //}
                //if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                //{
                //    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                //    oCn.RollBack();
                //    return false;
                //}
                ////============================

                ////
                ////foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
                ////{
                ////    Ds = oCn.RunProcReturn("exec h_p_Xs_SeOrderBill_Qty " + oSub.HICMOInterID, "");
                ////    if (Ds.Tables[0].Rows.Count == 0)
                ////        return;
                ////    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
                ////    {
                ////        sReturn = "汇报数量超过计划数量！不允许保存";
                ////        return false;
                ////    }
                ////}
                //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;

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Cj_CenterCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Xs_SeOrderBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================


                oCn.BeginTran();

                //检查主表内码是否重复，若重复则重新生成并继续检查，直到不再重复
                while (true)
                {
                    ds = oCn.RunProcReturn("select * from Cj_CenterCheckBillMain where HInterID = " + omodel.HInterID, "Cj_CenterCheckBillMain");
                    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 Cj_CenterCheckBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType" +
                    ",HInterID,HBillNo,HDate,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HPRDORGID" +
                    ",HICMOInterID,HICMOBillNo,HProcExchInterID,HProcExchBillNo,HLastResult,HMaterID,HUnitID) " +
                    "values(" +
                    "" + omodel.HDate.Year + "" +
                    "," + omodel.HDate.Month + "" +
                    ",'" + this.BillType + "'" +
                    ",'" + omodel.HBillSubType + "'" +

                    "," + omodel.HInterID + "" +
                    ",'" + omodel.HBillNo + "'" +
                    ",'" + omodel.HDate.ToString("yyyy-MM-dd hh:mm:ss") + "'" +

                    ",'" + omodel.HRemark + "'" +
                    ",'" + omodel.HMaker + "'" +
                    "," + "getdate()" + "" +
                    "," + omodel.HMainSourceInterID + "" +
                    ",'" + omodel.HMainSourceBillNo + "'" +
                    ",'" + omodel.HMainSourceBillType + "'" +
                    "," + omodel.HPRDORGID + "" +
                    "," + omodel.HICMOInterID + "" +
                    ",'" + omodel.HICMOBillNo + "'" +
                    "," + omodel.HProcExchInterID + "" +
                    ",'" + omodel.HProcExchBillNo + "'" +
                    "," + (omodel.HLastResult?1:0) + "" +
                    "," + omodel.HMaterID + "" +
                    "," + omodel.HUnitID + "" +
                    ")";
                    
                oCn.RunProc(mainSql);
                //插入子表
                foreach (Model.ClsCj_CenterCheckBillSub oSub in DetailColl)
                {
                    string subSql = "Insert into Cj_CenterCheckBillSub" +
                        "(HInterID,HEntryID,HBillNo_Bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                        ",HProcNo,HProcID,HUnQualifiedBar) " +
                        "values(" +
                        "" + omodel.HInterID + "" +
                        "," + oSub.HEntryID + "" +
                        ",'" + omodel.HBillNo + "'" +
                        ",'" + oSub.HRemark + "'" +
                        "," + oSub.HSourceInterID +
                        "," + oSub.HSourceEntryID +
                        ",'" + (oSub.HSourceBillNo==null?"":oSub.HSourceBillNo) + "'" +
                        ",'" + (oSub.HSourceBillType==null?"":oSub.HSourceBillType) + "'" +
                        ",'" + oSub.HProcNo + "'" +
                        "," + oSub.HProcID + "" +
                        "," + (oSub.HUnQualifiedBar?1:0) + "" +
                        ")";
                    oCn.RunProc(subSql);
                }

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_Cj_CenterCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Cj_CenterCheckBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================


                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 Cj_CenterCheckBillMain Where HInterID=" + lngBillKey.ToString(), "Cj_CenterCheckBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";
                    return false;
                }
                //固定赋值===========================================
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                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.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.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.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                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.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
                //omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryIDID"]);
                omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
                omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
                //========================================================
                omodel.HICMOInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HICMOInterID"]);
                omodel.HICMOEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
                omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]);

                omodel.HProcExchInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HProcExchInterID"]);
                omodel.HProcExchEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HProcExchEntryID"]);
                omodel.HProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcExchBillNo"]);

                omodel.HLastResult = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HLastResult"]) == 1 ? true : false;
                omodel.HMaterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HMaterID"]);
                omodel.HUnitID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HUnitID"]);
                //

                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from Cj_CenterCheckBillSub Where HInterID=" + lngBillKey.ToString(), "Cj_CenterCheckBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsCj_CenterCheckBillSub oSub = new Model.ClsCj_CenterCheckBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    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();
                    //===================================================
                    oSub.HProcNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcNo"]);
                    oSub.HProcID = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HProcID"]);
                    oSub.HUnQualifiedBar = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HUnQualifiedBar"])==1?true:false;

                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }

        //发起审批
        public bool startCheckFlow(Int64 lngBillKey,Int64 HCheckFlowID_select, ref string sReturn)
        {
            try
            {
                string HBillNo = "";                //单据号
                string HCheckFlowID = "";           //审批流ID
                string HCheckItemNowID = "";        //当前审核项目ID
                string HCheckItemNextID = "";       //待审核项目ID

                //判断是否已经发起审批
                string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "'";
                DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
                if (ds0 != null && ds0.Tables[0].Rows.Count > 0)
                {
                    sReturn = "单据已发起审批，不可重复审批！";
                    return false;
                }

                //获取单据数据
                string sql = "select * from " + this.MvarItemKey + " where HInterID = " + lngBillKey;
                DataSet ds = oCn.RunProcReturn(sql, this.MvarItemKey);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据不存在！";
                    return false;
                }
                HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();

                //获取单据类型对应的默认审批流
                string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
                                "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
                                "where a.HBillTypeID = '" + this.BillType + "' " +
                                "and a.HInterID = " + HCheckFlowID_select + " " +
                                "order by b.HFlowNo asc";
                DataSet ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
                if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                {
                    sReturn = "默认审批流不存在！";
                    return false;
                }

                HCheckFlowID = ds1.Tables[0].Rows[0]["HInterID"].ToString();
                HCheckItemNowID = ds1.Tables[0].Rows[0]["HCheckItemID"].ToString();
                if (ds1.Tables[0].Rows.Count >= 2)
                {
                    HCheckItemNextID = ds1.Tables[0].Rows[1]["HCheckItemID"].ToString();
                }
                else
                {
                    HCheckItemNextID = "0";
                }

                oCn.BeginTran();
                //增加 å•æ®å®¡æ‰¹çŠ¶æ€è¡¨ æ•°æ®
                for (int i = 0; i < ds1.Tables[0].Rows.Count; i++)
                {
                    string sql2 = "insert into Xt_BillCheckFlowStatus" +
                        "(HBillTypeID,HBillInterID,HBillNo,HCheckFlowID,HCheckItemID,HChecker,HCheckDate,HCheckNote) " +
                        "values(" +
                        "'" + this.BillType + "'," +
                        "" + lngBillKey + "," +
                        "'" + HBillNo + "'," +
                        "" + ds1.Tables[0].Rows[i]["HInterID"].ToString() + "," +
                        "" + ds1.Tables[0].Rows[i]["HCheckItemID"].ToString() + "," +
                        "" + "''" + "," +
                        "" + "''" + "," +
                        "" + "''" + "" +
                        ")";

                    oCn.RunProc(sql2);
                }

                //更新主表 å®¡æ‰¹æµ æ•°æ®
                string sql3 = "update " + this.MvarItemKey + " set HCheckFlowID = " + HCheckFlowID + ",HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
                oCn.RunProc(sql3);


                oCn.Commit();

                return true;
            }
            catch(Exception e)
            {
                sReturn += e.Message;
                return false;
            }
        }
    }

}

 Model/Model.csproj

@@ -708,6 +708,8 @@
    <Compile Include="车间管理\ClsQc_PreventErrMouldCheckBillSub.cs" />
    <Compile Include="车间管理\ClsGy_WorkBeginDotCheckListBillSub.cs" />
    <Compile Include="车间管理\ClsSc_WorkBeginDotCheckBillSub.cs" />
    <Compile Include="车间管理\ClsCj_CenterCheckBillMain.cs" />
    <Compile Include="车间管理\ClsCj_CenterCheckBillSub.cs" />
    <Compile Include="车间管理\Sc_AssemblyBill_BindSourceTemp.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillMain.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillSub.cs" />

 Model/³µ¼ä¹ÜÀí/ClsCj_CenterCheckBillMain.cs

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

namespace Model
{
    public class ClsCj_CenterCheckBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public int HPRDORGID;

        public int HICMOInterID;
        public int HICMOEntryID;
        public string HICMOBillNo;
        public double HICMOQty;

        public int HProcExchInterID;
        public int HProcExchEntryID;
        public string HProcExchBillNo;
        public double HProcExchQty;

        public bool HLastResult;
        public int HMaterID;
        public int HUnitID;
    }
}

 Model/³µ¼ä¹ÜÀí/ClsCj_CenterCheckBillSub.cs

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

namespace Model
{
    public class ClsCj_CenterCheckBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public string HProcNo;
        public int HProcID;
        public bool HUnQualifiedBar;
    }
}

 SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs

@@ -4323,7 +4323,7 @@
                }

                string sql1 = "select * from  h_v_Gy_CusType where 1 = 1";
                string sql = sql1 + sWhere + " order by å®¢æˆ·åˆ†ç±»ä»£ç  ";
                string sql = sql1 + sWhere + " order by HNumber ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_CusType");

                //添加列名

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -281,7 +281,7 @@
                    }
                    string HNumber = ds.Tables[0].Rows[0]["客户代码"].ToString();
                    // ä½¿ç”¨æ­£åˆ™è¡¨è¾¾å¼æ‰¾åˆ°æ•°å­—部分  (?<=\D)是一个零宽断言，表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾
                    Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
                    Match match = Regex.Match(HNumber, @"(\d+)$");
                    if (match.Success)
                    {
                        string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // æå–前缀  

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -79,7 +79,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where ç»„织名称='" + Organization + "'");
                string sql1 = string.Format(@"select top(500) * from h_v_Gy_MaterialList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by ç‰©æ–™ä»£ç  desc", "h_v_Gy_MaterialList");

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -706,5 +706,45 @@
            }
        }
        #endregion



        #region åŸºç¡€èµ„æ–™ èŽ·å–数据
        [Route("Gy_GetBaseData/Gy_GetBaseData")]
        [HttpGet]
        public object Gy_GetBaseData(string sql,string tableView, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();


                ds = oCN.RunProcReturn(sql, tableView);

                //添加列名
                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/CJGL/Cj_CenterCheckBillController.cs

New file
@@ -0,0 +1,921 @@
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;

namespace WebAPI.Controllers
{
    //收款单Controller
    public class Cj_CenterCheckBillController : ApiController
    {
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        public DAL.ClsCj_CenterCheckBill BillOld = new DAL.ClsCj_CenterCheckBill();
        public DAL.ClsCj_CenterCheckBill BillNew0 = new DAL.ClsCj_CenterCheckBill();

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

        #region ä¸­æ£€å•åˆ—表 æŸ¥è¯¢
        /// <summary>
        /// è¿”回项目阶段列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Cj_CenterCheckBill/list")]
        [HttpGet]
        public object getCj_CenterCheckBill(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_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_Cj_CenterCheckBillList_Query order by å•æ®å· desc", "h_v_Cj_CenterCheckBillList_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Cj_CenterCheckBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Cj_CenterCheckBillList_Query");
                }

                //添加列名
                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("Cj_CenterCheckBill/getDataByBarCode_CenterCheckBill")]
        [HttpGet]
        public object getDataByBarCode_CenterCheckBill(string HBarCode, string HInterID, string user, string HBillType)
        {
            try
            {
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "空白码,条形码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //拆分条形码
                string sBillBarCode = HBarCode.Trim();
                string[] NewBarCode;
                if (sBillBarCode.CompareTo("#") > 0)
                {
                    NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
                    sBillBarCode = NewBarCode[0];
                }
                string sBillNo = sBillBarCode; //条形码

                string[] arr = sBillNo.Split('&'); //以符号‘&’分割条形码
                string BillNo_PGD = arr[0]; //单据号
                string entryid_PGD = "";//子id
                if (arr.Length > 1)
                {
                    entryid_PGD = arr[1];
                }

                //截取条码类型 å‰ä¸‰ä½
                string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
                //截取条码类型2 å‰å››ä½
                string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
                //截取内码
                string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));







                string sErr = "";

                switch (BillNoType2)
                {
                    case "GXLX"://流转卡

                        string sql = "";
                        if (HBillType == "7502")
                        {
                            ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill__ProcList_New  '" + BillNo_PGD + "','" + user + "'", "h_p_Sc_ProcessExchangeBill__ProcList");
                        }
                        break;
                    default:
                        break;
                }

                if (ds != null)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回数据，条码前缀错误。";
                    objJsonResult.data = "";
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸­æ£€ æ–°å¢žä¿å­˜
        [Route("Cj_CenterCheckBill/add_CenterCheckBill")]
        [HttpPost]
        public object add_CenterCheckBill([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            try
            {
                //反序列化
                string msg2 = "[" + sArray[0].ToString() + "]";
                string user = sArray[1].ToString();//用户名
                string OperationType = sArray[2].ToString();//类型
                string msg_entry = sArray[3].ToString(); //明细行信息

                ////判断是否有编辑权限
                //if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_Edit", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无编辑权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                DAL.ClsCj_CenterCheckBill BillNew = new DAL.ClsCj_CenterCheckBill();
                string s = "";

                List<Model.ClsCj_CenterCheckBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCj_CenterCheckBillMain>>(msg2);
                foreach (Model.ClsCj_CenterCheckBillMain oItem in lsmain)
                {
                    if (OperationType == "1")
                    {
                        //单据号是否重复
                        if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！不允许保存！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    if (OperationType == "3")
                    {
                        if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据有误！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //判断是否可编辑
                        if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据已经被审核，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (BillOld.omodel.HBillStatus > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = s + "，不允许修改";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }

                    BillNew.omodel = oItem;
                }

                //表体数据
                List<Model.ClsCj_CenterCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCj_CenterCheckBillSub>>(msg_entry);
                int i = 0;
                foreach(Model.ClsCj_CenterCheckBillSub oItemSub in subList)
                {
                    i++;
                    oItemSub.HEntryID = i;

                    BillNew.DetailColl.Add(oItemSub);
                }

                //单据完整性判断
                if (BillNew.omodel.HProcExchBillNo == "" && BillNew.omodel.HMainSourceBillNo=="")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "流转卡没有选择！请扫描条形码或输入条形码后回车";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //保存
                //保存完毕后处理
                bool bResult;
                if (OperationType == "1")
                {
                    bResult = BillNew.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (OperationType == "3")
                {
                    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = false;
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    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 = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸­æ£€å• åˆ é™¤
        /// <summary>
        ///参数：string HInterID。
        ///返回值：object。
        /// </summary>
        [Route("Cj_CenterCheckBill/delete")]
        [HttpGet]
        public object deleteCj_CenterCheckBill(string HInterID, string user)
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_Drop", 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;
                }

                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据有误！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //判断是否可编辑
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据已经被审核，不允许删除！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

                //删除前控制=========================================      
                string sql1 = "exec h_p_Cj_CenterCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql1, "h_p_Cj_CenterCheckBill_BeforeDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //==================================================================================  

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }

                oCN.BeginTran();

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

                //删除后控制==================================================================================      
                string sql2 = "exec h_p_Cj_CenterCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql2, "h_p_Cj_CenterCheckBill_AfterDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    s = "删除后判断失败，请与网络管理人员联系";
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + s;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    s = ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + s;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                //==============================================================================================

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "您已删除单据号为" + BillOld.omodel.HBillNo + "的收款单！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸­æ£€å• å®¡æ ¸/反审核
        /// <summary>
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Cj_CenterCheckBill/AuditCj_CenterCheckBill")]
        [HttpGet]
        public object AuditCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Cj_CenterCheckBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterID数据判断
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //对HInterID进行类型的转换
                DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill();                              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //根据HInterID获取该单据的数据
                {
                    if (oBill.omodel.HCloseMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已关闭!不能再次审核！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HDeleteMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已作废!不能再次审核！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //审核判断
                    {
                        if (oBill.omodel.HChecker.Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (oBill.omodel.HChecker.Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //进行需要进行的审核/反审核操作
                if (IsAudit == 0) //审核提交
                {
                    //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                    string s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    DateTime HDate = DateTime.Now;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                    {
                        objJsonResult.Message = s;
                        return objJsonResult;
                    }


                    //审核前控制=========================================      
                    string sql1 = "exec h_p_Cj_CenterCheckBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Cj_CenterCheckBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:审核前判断失败，请与网络管理人员联系";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //==================================================================================    

                    oCN.BeginTran();
                    //反写销售订单数据
                    sql1 = "exec h_p_Sc_StationOutOrInBill_ReWriteByCenterCheckBill " + oBill.omodel.HInterID + ",'" + CurUserName + "'";
                    oCN.RunProcReturn(sql1, "h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill");



                    //审核提交
                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cj_CenterCheckBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        oCN.RollBack();

                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸­æ£€å• å…³é—­/反关闭
        /// <summary>
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">关闭(0),反关闭(1)</param>
        /// <param name="CurUserName">关闭人</param>
        /// <returns></returns>
        [Route("Cj_CenterCheckBill/CloseCj_CenterCheckBill")]
        [HttpGet]
        public object CloseCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Cj_CenterCheckBill_Close";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //检查权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "关闭失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterID数据判断
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //对HInterID进行类型的转换
                DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill();              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //根据HInterID获取该单据的数据
                {
                    if (oBill.omodel.HDeleteMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已作废!不能进行关闭！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HChecker.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据未审核!不能进行关闭！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //关闭判断
                    {
                        if (oBill.omodel.HCloseMan.Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次关闭！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反关闭判断
                    {
                        if (oBill.omodel.HCloseMan.Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未关闭!不需要反关闭！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //进行需要进行的关闭/反关闭操作
                if (IsAudit == 0) //关闭提交
                {
                    //关闭提交
                    if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "关闭成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //反关闭提交
                {
                    //反关闭提交
                    if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反关闭成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "关闭失败或者反关闭失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸­æ£€å• ä½œåºŸ/反作废
        /// <summary>
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">作废(0),反作废(1)</param>
        /// <param name="CurUserName">作废人</param>
        /// <returns></returns>
        [Route("Cj_CenterCheckBill/DeleteCj_CenterCheckBill")]
        [HttpGet]
        public object DeleteCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Cj_CenterCheckBill_Delete";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //检查权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "作废失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterID数据判断
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //对HInterID进行类型的转换
                DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill();              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //根据HInterID获取该单据的数据
                {
                    if (oBill.omodel.HChecker.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核!不能进行作废！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HBillStatus.ToString() == "6")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据在审核中!不能进行作废!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //作废判断
                    {
                        if (oBill.omodel.HDeleteMan.Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能再作废！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反作废判断
                    {
                        if (oBill.omodel.HDeleteMan.Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未作废!不需要反作废！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //进行需要进行的作废/反作废操作
                if (IsAudit == 0) //作废提交
                {
                    //作废提交
                    if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "作废成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //反关闭提交
                {
                    //反关闭提交
                    if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反作废成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "作废失败或者反作废失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -2658,6 +2658,6 @@
            }
        }
        #endregion
        //
        // 
    }
}

 WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs

@@ -1894,5 +1894,143 @@
            }
        }
        #endregion

        #region é”€å”®å‡ºåº“单查询列表
        [Route("Kf_SellOutBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Kf_SellOutBillQuery where 1 = 1 ";

                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Kf_SellOutBillQuery  order by hmainid desc", "h_v_Kf_SellOutBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Kf_SellOutBillQuery");
                }



                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é”€å”®å‡ºåº“单查询子列表
        [Route("Kf_SellOutBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Kf_SellOutBillQuerySub where hmainid =  " + hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_SellOutBillQuerySub");


                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é”€å”®å‡ºåº“单 åˆ¤æ–­æ˜¯å¦å…·å¤‡æŸ¥çœ‹é‡‘额权限
        [Route("Kf_SellOutBill/CheckRight_Money")]
        [HttpGet]
        public object CheckRight_Money(string user)
        {
            try
            {
                //判断查询权限
                if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Money", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                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
    }
}

 WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs

@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
using SyntacticSugar.constant;

namespace WebAPI.Controllers
{
@@ -1531,5 +1532,109 @@
        }
        #endregion

        #region åº”收单查询列表
        [Route("Xs_ReceivableBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_ReceivableBillQuery where 1 = 1 ";

                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillQuery  order by hmainid desc", "h_v_Xs_ReceivableBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_ReceivableBillQuery");
                }



                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region åº”收单查询子列表
        [Route("Xs_ReceivableBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_ReceivableBillQuerySub where hmainid =  " + hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_ReceivableBillQuerySub");


                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -3469,5 +3469,39 @@
            }
        }
        #endregion

        #region é”€å”®è®¢å• åˆ¤æ–­æ˜¯å¦å…·å¤‡æŸ¥çœ‹é‡‘额权限
        [Route("Xs_SeOrderBill/CheckRight_Money")]
        [HttpGet]
        public object CheckRight_Money(string user)
        {
            try
            {
                //判断查询权限
                if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Money", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                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
    }
}

 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs

@@ -1491,7 +1491,7 @@
        [HttpGet]
        public object AuditXs_SeOutStockBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
        {
            //string ModRightNameCheck = "Cg_POOrderBill_Check";
            //string ModRightNameCheck = "Xs_SeOutStockBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
@@ -1597,7 +1597,7 @@
                    #region å®¡æ ¸å‰çš„相关判断
                    //审核前控制=========================================      
                    string sql1 = "exec h_p_Xs_SeOutStockBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl");
                    ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOutStockBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
@@ -1725,7 +1725,7 @@
                {
                    #region åå®¡æ ¸å‰çš„相关判断
                    //反审核前控制=========================================
                    DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
                    DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl");
                    if (ds == null)
                    {
                        objJsonResult.code = "0";
@@ -1922,5 +1922,109 @@
            }
        }
        #endregion

        #region å‘货通知单查询列表
        [Route("Xs_SeOutStockBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_SeOutStockBillQuery where 1 = 1 ";

                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SeOutStockBillQuery  order by hmainid desc", "h_v_Xs_SeOutStockBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOutStockBillQuery");
                }



                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å‘货通知单查询子列表
        [Route("Xs_SeOutStockBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Xs_SeOutStockBillQuerySub where hmainid =  " + hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOutStockBillQuerySub");


                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs

@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
using SyntacticSugar.constant;

namespace WebAPI.Controllers
{
@@ -1651,5 +1652,110 @@
            }
        }
        #endregion


        #region æ”¶æ¬¾å•æŸ¥è¯¢åˆ—表
        [Route("YS_ReceiveBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_YS_ReceiveBillQuery where 1 = 1 ";

                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillQuery  order by hmainid desc", "h_v_YS_ReceiveBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_YS_ReceiveBillQuery");
                }



                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ”¶æ¬¾å•æŸ¥è¯¢å­åˆ—表
        [Route("YS_ReceiveBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限

                if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_YS_ReceiveBillQuerySub where hmainid =  " + hmainid;

                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_YS_ReceiveBillQuerySub");


                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs

@@ -100,6 +100,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题

            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果

            //单据内容
            public string HDate;                                //日期
@@ -124,6 +126,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题

            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果

            //单据内容
            public string HDate;                                //日期
@@ -154,6 +158,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题

            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果

            //单据内容
            public string HEmployeeID;                          //成员ID
@@ -191,6 +197,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题

            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果

            //单据内容
            public string HQuestionType;                        //问题分类
@@ -397,7 +405,7 @@
                //OriginatorId = "12",                                                                                          //根据流程发起人工号查询。

                //TaskId = "12",                                                                                                //任务ID。
                CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //创建时间终止值。

                PageSize = pageSize,                                                  //分页大小。
@@ -547,6 +555,50 @@
            }
        }
        #endregion

        #region èŽ·å– å®œæ­ æ ¹æ®æµç¨‹å®žä¾‹ID获取流程实例
        public bool getInstanceStatusByInstanceID__YiDa(string appType, string systemToken, string userID, string instanceID, ref GetInstanceByIdResponse response, ref string msg)
        {
            AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient5();
            AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdHeaders getInstanceByIdHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdHeaders();
            getInstanceByIdHeaders.XAcsDingtalkAccessToken = this.accessToken;
            AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdRequest getInstanceByIdRequest = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdRequest
            {
                SystemToken = systemToken,
                Language = "12",
                UserId = userID,
                AppType = appType,
            };
            try
            {
                GetInstanceByIdResponse getInstanceByIdResponse = client.GetInstanceByIdWithOptions(instanceID, getInstanceByIdRequest, getInstanceByIdHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions());
                response = getInstanceByIdResponse;
                return true;
            }
            catch (TeaException err)
            {
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘定位问题
                }
                msg = err.Message;
                return false;
            }
            catch (Exception _err)
            {
                TeaException err = new TeaException(new Dictionary<string, object>
                {
                    { "message", _err.Message }
                });
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘定位问题
                }
                msg = _err.Message;
                return false;
            }
        }
        #endregion
        #endregion

        #region æ•°æ®åŒæ­¥æ–¹æ³•
@@ -599,32 +651,104 @@
                            int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
                            oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");

                            if (keys.Contains("dateField_lo6w37hk"))
                            //审核签到表
                            //if (keys.Contains("dateField_lo6w37hk"))
                            //{
                            //    double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
                            //    oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
                            //}

                            //if (keys.Contains("selectField_lockncvh_id"))
                            //{
                            //    oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
                            //}

                            //if (keys.Contains("selectField_lockncvg_id"))
                            //{
                            //    oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
                            //}

                            //if (keys.Contains("employeeField_lo6w37hf"))
                            //{
                            //    oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
                            //}

                            //if (keys.Contains("employeeField_lo6w37hf_id"))
                            //{
                            //    oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
                            //}


                            //签到表
                            if (keys.Contains("dateField_ls9ma7h3"))
                            {
                                double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
                                double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_ls9ma7h3"].ToString());
                                oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
                            }

                            if (keys.Contains("selectField_lockncvh_id"))
                            if (keys.Contains("selectField_ls9ma7h9"))
                            {
                                oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
                                oItem.HArea = response.Body.Result[i].FormData["selectField_ls9ma7h9"].ToString().Replace("'", "");
                            }

                            if (keys.Contains("selectField_lockncvg_id"))
                            if (keys.Contains("selectField_ls9ma7h7"))
                            {
                                oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
                                oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_ls9ma7h7"].ToString().Replace("'", "");
                            }

                            if (keys.Contains("employeeField_lo6w37hf"))
                            if (keys.Contains("employeeField_ls9ma7h5"))
                            {
                                oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
                                oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5"])[0].ToString().Replace("'", "");
                            }

                            if (keys.Contains("employeeField_lo6w37hf_id"))
                            if (keys.Contains("employeeField_ls9ma7h5_id"))
                            {
                                oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
                                oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
                            }
                            



                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }

                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }

                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }



                            lsmain.Add(oItem);
                        }catch(Exception e)
                        {
@@ -660,7 +784,8 @@
            string appType = "APP_MMBPP3IFGFBX3VQAIKYX";
            string systemToken = "TP866A81107FVI9LBFQRZ9953YWZ2GYR2W6OL1L";
            string userID = "1933673646699149";
            string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX";
            //string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX";            //分层审核签到表
            string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7";              //签到表
            int pageNumber = 1;
            int pageSize = 100;

@@ -680,7 +805,7 @@

            try
            {
                oCN.BeginTran();
              oCN.BeginTran();
                foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
                {
                    string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
@@ -694,7 +819,8 @@
                    string sql_main = "insert into DD_FenCengShenHeQianDaoBiao" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
                        ",HDate" +
                        ",HCheckLevel,HArea,HEmployeeID,HEmplpyee) " +
                        ",HCheckLevel,HArea,HEmployeeID,HEmplpyee" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -710,6 +836,8 @@
                        ",'" + (oItem.HArea==null?"": oItem.HArea) + "'" +
                        ",'" + (oItem.HEmployeeID==null?"": oItem.HEmployeeID) + "'" +
                        ",'" + (oItem.HEmplpyee==null?"": oItem.HEmplpyee) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";

                    oCN.RunProc(sql_main);
@@ -820,7 +948,50 @@
                            {
                                oItem.HRiskRemak_Result = response.Body.Result[i].FormData["textareaField_lxblb9xa"].ToString().Replace("'", "");
                            }
                            


                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }

                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }

                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }




                            lsmain.Add(oItem);
                        }catch(Exception e)
                        {
@@ -886,7 +1057,8 @@
                    string sql_main = "insert into DD_XianChangBianHuaDianPingShenDan" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
                        ",HDate" +
                        ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result) " +
                        ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -908,6 +1080,8 @@
                        ",'" + (oItem.HRiskRemark_Equipment==null?"": oItem.HRiskRemark_Equipment) + "'" +
                        ",'" + (oItem.HRiskRemark_Product==null?"": oItem.HRiskRemark_Product) + "'" +
                        ",'" + (oItem.HRiskRemak_Result==null?"": oItem.HRiskRemak_Result) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";

                    oCN.RunProc(sql_main);
@@ -1049,6 +1223,43 @@
                                oItem.HCloseConfirm = response.Body.Result[i].FormData["selectField_ltpe6mdd"].ToString().Replace("'", "");
                            }

                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if(getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }

                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if(oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }else if(oItem.HInstanceStatus== "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }

                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult== "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }else if(oItem.HApprovedResult== "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }

                            lsmain.Add(oItem);
                        }
                        catch (Exception e)
@@ -1118,7 +1329,7 @@
                        ",HCheckLevel,HCheckArea,HPhoto_NoSatisfyRequire,HDescription_NoSatisfyRequire,HQuestionType,HRequire_ModifyDate,HEmployeeID_Duty,HEmployee_Duty" +
                        ",HQuestionIsNoModify" +
                        ",HReason_NoModify,HReasonAnalysis,HMethod_Modify" +
                        ",HDate_Achieve,HFile_Evidence,HCloseConfirm" +
                        ",HDate_Achieve,HFile_Evidence,HCloseConfirm,HInstanceStatus,HApprovedResult" +
                        ") " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
@@ -1148,7 +1359,8 @@
                        "," + (oItem.HDate_Achieve==null?"null":"'"+ oItem.HDate_Achieve+ "'") + "" +
                        ",'" + (oItem.HFile_Evidence==null?"": oItem.HFile_Evidence) + "'" +
                        ",'" + (oItem.HCloseConfirm==null?"": oItem.HCloseConfirm) + "'" +

                        ",'" + (oItem.HInstanceStatus==null?"":oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult==null?"":oItem.HApprovedResult) + "'" +
                        ")";

                    oCN.RunProc(sql_main);
@@ -1224,7 +1436,46 @@
                                oItem.HDept_Duty = response.Body.Result[i].FormData["selectField_lxcunmsu"].ToString().Replace("'", "");
                            }

                            
                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }

                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }

                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }



                            List<YD_QRQCWenTiTiJiaoBiaoSub1> sub1List = new List<YD_QRQCWenTiTiJiaoBiaoSub1>();
                            if (keys_main.Contains("tableField_lx4azand"))
@@ -1367,6 +1618,12 @@
                oCN.BeginTran();
                foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
                {
                    ////判断单据 å®žä¾‹çŠ¶æ€æ˜¯å¦ä¸º"已完成"且 å®¡æ‰¹ç»“果为"同意",若是则同步数据，否则不进行同步数据
                    //if (!(oItem.HInstanceStatus == "已完成" && oItem.HApprovedResult == "同意"))
                    //{
                    //    continue;
                    //}

                    string sql_searchRepeat = "select * from DD_QRQCWenTiTiJiaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
                    DataSet ds_searchRepeat = oCN.RunProcReturn(sql_searchRepeat, "DD_QRQCWenTiTiJiaoBiao");
                    if (ds_searchRepeat != null && ds_searchRepeat.Tables[0].Rows.Count > 0)
@@ -1382,7 +1639,8 @@
                    }

                    string sql_main = "insert into DD_QRQCWenTiTiJiaoBiao" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty) " +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -1395,6 +1653,8 @@

                        ",'" + (oItem.HQuestionType==null?"": oItem.HQuestionType) + "'" +
                        ",'" + (oItem.HDept_Duty==null?"": oItem.HDept_Duty) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";
                    oCN.RunProc(sql_main);


 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-09-10T07:26:48.7055081Z;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>False|2024-09-11T13:06:15.4423786Z;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>09/10/2024 19:04:51</publishTime>
      <publishTime>09/11/2024 21:06:39</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>09/10/2024 19:04:51</publishTime>
      <publishTime>09/11/2024 21:06:39</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>09/10/2024 19:04:48</publishTime>
      <publishTime>09/11/2024 21:06:35</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>09/10/2024 19:04:48</publishTime>
      <publishTime>09/11/2024 21:06:35</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>09/10/2024 19:04:41</publishTime>
      <publishTime>09/11/2024 21:06:25</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>09/10/2024 19:04:41</publishTime>
      <publishTime>09/11/2024 21:06:25</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>09/10/2024 19:04:43</publishTime>
      <publishTime>09/11/2024 21:06:28</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>09/10/2024 19:04:43</publishTime>
      <publishTime>09/11/2024 21:06:28</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>09/10/2024 19:04:39</publishTime>
      <publishTime>09/11/2024 21:06:23</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>09/10/2024 19:04:39</publishTime>
      <publishTime>09/11/2024 21:06:23</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>09/10/2024 19:04:40</publishTime>
      <publishTime>09/11/2024 21:06:24</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>09/10/2024 19:04:40</publishTime>
      <publishTime>09/11/2024 21:06:24</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>09/10/2024 19:04:41</publishTime>
      <publishTime>09/11/2024 21:06:24</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>09/10/2024 19:04:41</publishTime>
      <publishTime>09/11/2024 21:06:24</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>09/10/2024 19:02:30</publishTime>
      <publishTime>09/11/2024 21:04:14</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>09/10/2024 19:02:30</publishTime>
      <publishTime>09/11/2024 21:04:14</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>09/10/2024 19:02:37</publishTime>
      <publishTime>09/11/2024 21:04:23</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>09/10/2024 19:02:37</publishTime>
      <publishTime>09/11/2024 21:04:23</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>09/10/2024 19:05:26</publishTime>
      <publishTime>09/11/2024 21:07:20</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>09/10/2024 19:05:26</publishTime>
      <publishTime>09/11/2024 21:07:20</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>

 WebAPI/Web.config

@@ -8,10 +8,10 @@



  <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  </sectionGroup>
 </configSections>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
            <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
        </sectionGroup>
    </configSections>
    <connectionStrings>
        <add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />

@@ -23,6 +23,8 @@
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />--><!--颜台式机-->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>-->
        <!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -32,13 +34,20 @@
        <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/>     å®‰ç‘žæœåŠ¡å™¨-->
        <!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>     å®‰ç‘žæœåŠ¡å™¨-->
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->    <!--测试服务器-->
        <!--<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://192.168.110.57:81/WEBS/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"/>--><!--斯莫尔-->
		
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>-->
        <!--斯莫尔-->
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />-->
        <!--乔一-->
        <add key="sUrl" value="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" />

        <add key="webpages:Version" value="3.0.0.0" />
        <add key="webpages:Enabled" value="false" />
        <add key="ClientValidationEnabled" value="true" />
@@ -106,15 +115,15 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>

 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>
</configuration>
    <applicationSettings>
        <WebAPI.Properties.Settings>
            <setting name="WebAPI_WebS_WebService1" serializeAs="String">
                <value>http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx</value>
            </setting>
        </WebAPI.Properties.Settings>
    </applicationSettings>
</configuration>
<!--ProjectGuid: 5B60CE0C-963C-4DC2-91B3-0B471AAC5438-->

 WebAPI/WebAPI.csproj

@@ -439,6 +439,7 @@
    <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
    <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
    <Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
    <Compile Include="Controllers\仓存管理\Kf_MoveStockBillController.cs" />
    <Compile Include="Controllers\品质管理\质量月度目标单\QC_MonthTarGetBillController.cs" />
    <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

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

Binary files differ

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

@@ -1,3 +1,11 @@
<<<<<<< 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.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
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
=======
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
@@ -16,3 +24,4 @@
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
>>>>>>> 5c89a888203ea10438854942e3fba9c6c24b480a

 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.CoreCompileInputs.cache

File was deleted