合并分支

chenhaozhe

16 小时以前 6d85c65004990ac29f58ad233eba3a795c2f818b

合并分支

 DAL/ClsPay_WayBillPaymentBill.cs

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

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

        public ClsPay_WayBillPaymentBill()
        {
            base.MvarItemKeySub = "Pay_WayBillPaymentBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Pay_WayBillPaymentBillMain";
            base.MvarReportTitle = "运单费用结算单";
            base.BillType = "2102";
            base.HBillSubType = "2102";

        }

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

        ~ClsPay_WayBillPaymentBill()
        {
            DetailColl = null;
        }

        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Pay_WayBillPaymentBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HCarrierID=" + omodel.HCarrierID.ToString() +
                ",HCurID=" + omodel.HCurID.ToString() +
                ",HExRate=" + omodel.HExRate.ToString() +
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HEmpID=" + omodel.HEmpID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                foreach (Model.ClsPay_WayBillPaymentBillSub oSub in DetailColl)
                {
                    string subSql = "insert into Pay_WayBillPaymentBillSub" +
                         "" +
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HBeginAddr,HEndAddr,HTransType,HMoney,HRemark) " +
                         " values(" +
                         "" + lngBillKey.ToString() +
                         "," + oSub.HEntryID.ToString() +
                         "," + oSub.HSourceInterID +
                         "," + oSub.HSourceEntryID +
                         ",'" + oSub.HSourceBillNo +
                         "','" + oSub.HSourceBillType +
                         "','" + oSub.HBeginAddr +
                         "','" + oSub.HEndAddr +
                         "','" + oSub.HTransType +
                         "','" + oSub.HMoney +
                         "','" + oSub.HRemark +
                         "')";
                    oCn.RunProc(subSql);
                }
                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Pay_WayBillPaymentBillMain   " +
               "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
               ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
               ",HCarrierID,HCurID,HExRate" +
               ",HDeptID,HEmpID,HOrgID" +
               ") " +
               " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
               ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
               "," + omodel.HCarrierID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
               ", '" + omodel.HDeptID.ToString() + "','" + omodel.HEmpID.ToString()+ "','"  + omodel.HOrgID + "'" +
               ") ");
                //插入子表
                foreach (Model.ClsPay_WayBillPaymentBillSub oSub in DetailColl)
                {
                    string subSql = "insert into Pay_WayBillPaymentBillSub" +
                         "" +
                         "" +
                         "" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                         ",HBeginAddr,HEndAddr,HTransType,HMoney,HRemark) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
                         "," + oSub.HSourceInterID +
                         "," + oSub.HSourceEntryID +
                         ",'" + oSub.HSourceBillNo +
                         "','" + oSub.HSourceBillType +
                         "','" + oSub.HBeginAddr +
                         "','" + oSub.HEndAddr +
                         "','" + oSub.HTransType +
                         "','" + oSub.HMoney +
                         "','" + oSub.HRemark +
                         "')";
                    oCn.RunProc(subSql);
                }
                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn("Select * from Pay_WayBillPaymentBillMain Where HInterID=" + lngBillKey.ToString(), "Pay_WayBillPaymentBillMain");
                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.HCarrierID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCarrierID"]);
                omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
                omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
                omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
                //

                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Pay_WayBillPaymentBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Pay_WayBillPaymentBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsPay_WayBillPaymentBillSub oSub = new Model.ClsPay_WayBillPaymentBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
                    oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }


    }

}

 DAL/DAL.csproj

@@ -81,6 +81,7 @@
    <Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
    <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
    <Compile Include="ClsGy_MaterialPackingRelation.cs" />
    <Compile Include="ClsPay_WayBillPaymentBill.cs" />
    <Compile Include="ClsWL_YayBillMain.cs" />
    <Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
    <Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />

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

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 Model/Model.csproj

@@ -126,6 +126,8 @@
    <Compile Include="基础资料\基础资料\ClsGy_RepairCheckClass_Model.cs" />
    <Compile Include="物流管理\ClsCg_CarTrajectoryBillMain.cs" />
    <Compile Include="物流管理\ClsCg_CarTrajectoryBillSub.cs" />
    <Compile Include="物流管理\ClsPay_WayBillPaymentBillMain.cs" />
    <Compile Include="物流管理\ClsPay_WayBillPaymentBillSub.cs" />
    <Compile Include="物流管理\ClsWL_YayBillMainBillSub.cs" />
    <Compile Include="物流管理\ClsWL_YayBillMainBillMain.cs" />
    <Compile Include="生产管理\ClsSc_ShiftsBeginInfoBillMain.cs" />

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

Binary files differ

 Model/ÎïÁ÷¹ÜÀí/ClsPay_WayBillPaymentBillMain.cs

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

namespace Model
{
    public class ClsPay_WayBillPaymentBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public DateTime HAccDate;//  datetime  //收款日期
        public Int64 HCarrierID;//   int  //供应商（gy_supplier）
        public Int64 HCurID;//   int   //币别
        public Single HExRate;//    money //汇率（选币别带出）
        public Int64 HDeptID;//  int  //部门
        public Int64 HEmpID;//   int     //经手人
        public Int64 HProjectMoneyID;//   int     //费用项目
        public string HType;//   varchar(20)     --发票类型
        public double HMoney;//  dec(18,8) //单据金额
        public double HTaxRate;//  dec(18,8) //税率
        public double HSumMoney;//  dec(18,8) //总金额
        public string HExplanation;//   varchar(200)     --摘要
        public string HInnerBillNo;// varchar(100)      --内部单据号
        public Int64 HOrgID;   //组织
    }
}

 Model/ÎïÁ÷¹ÜÀí/ClsPay_WayBillPaymentBillSub.cs

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

namespace Model
{
    public class ClsPay_WayBillPaymentBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public DateTime HEntryCloseDate;//   datetime      --行关闭 (默认为'')        new
        public string HRemark;//         varchar(200)        --备注 
        public Int64 HProjectMoneyID;//   int     //费用项目
        public string HTypeSub;//   varchar(20)     --发票类型
        public double HMoney;//  dec(18,8) //单据金额
        public double HTaxRate;//  dec(18,8) //税率
        public double HSumMoney;//  dec(18,8) //总金额
        public int  HBeginAddr;//  dec(18,8) //总金额
        public int HEndAddr;//  dec(18,8) //总金额
        public string HTransType;//  dec(18,8) //总金额
    }
}

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

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

Binary files differ

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

@@ -10,3 +10,17 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
<<<<<<< HEAD
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
=======
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
>>>>>>> dbb4487be15ef158326d46bb81b6284987e35a2c

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -315,6 +315,16 @@
                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        }
                        break;
                    case "MO"://流转卡
                         sErr = "";
                        if (oSystemParameter.ShowBill(ref sErr))
                        {
                            if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                            {
                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                            }
                        }
                        break;
                }

                switch (BillNoType2)
@@ -352,6 +362,9 @@
                    case "P204"://流转卡
                    case "P205"://流转卡
                    case "P201"://流转卡
                    case "MO26"://华舟流转卡
                    case "MO27"://华舟流转卡
                    case "MO28"://华舟流转卡
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        break;
                }

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -569,8 +569,18 @@
                }

                //得到信息（委外标记为0时，流转标记为1时）
                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "' and ä¸‹é“流转工序<>'转' and å§”外标记=0 and æµè½¬æ ‡è®°=1  and å·¥åºå·='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
                //Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "' and å·¥åºå·='" + sProcNo + "' and å§”外标记=0 and æµè½¬æ ‡è®°=1 ", "h_v_Sc_ProcessExchangeBillList");
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "'  and å§”外标记=0 and æµè½¬æ ‡è®°=1  and å·¥åºå·='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
                    }
                    else
                    {
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "'  and ä¸‹é“流转工序<>'转'   and å§”外标记=0 and æµè½¬æ ‡è®°=1  and å·¥åºå·='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
                    }
                }
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1387,9 +1387,9 @@
                  "'" + ds.Tables[0].Rows[0]["HGroupID"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HMaker"].ToString() + "', getdate(), " +
                  "'0', " +
                  "'" + ds.Tables[0].Rows[0]["HProcExchInterID"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HICMOInterID"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HICMOEntryID"].ToString() + "', " +
                  "'" + ds.Tables[0].Rows[0]["HICMOBillNo"].ToString() + "', " +
                  "'3772', " +
                  "'0', " +
                  "'0', " +

 WebAPI/Controllers/LMESController.cs

@@ -729,7 +729,15 @@
                    oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSourceID + " where HInterID=" + HInterID + " and HEntryID=" + HEntryID);

                    oCN.RunProc("exec h_p_Sc_ICMOBillStatus_Tmp_PG " + HInterID + "," + HEntryID);
                  
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                        {
                            //自动生成工作联系单
                            oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + HInterID + "," + 3772);
                        }
                    }                    
                    oCN.Commit();
                }


 WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs

@@ -354,26 +354,7 @@
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };

       
                string checkAuditSql = $@"
                    SELECT HBillStatus 
                    FROM  Sc_MouldInRequestBillMain 
                    WHERE HInterID = {hmainid}";

                DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
                {
                    int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
                 
                    if (hBillStatus == 2)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }
                else
                {
                    return new { code = "0", count = 0, Message = "单据不存在！" };
                }
              

                // ç›´æŽ¥æ›´æ–°æ‰˜æ•°
                string updateSql = $@"

 WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs

@@ -518,28 +518,6 @@
                if (newPallet <= 0)
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };


                string checkAuditSql = $@"
                    SELECT HBillStatus 
                    FROM Sc_MouldOutRequestBillMain 
                    WHERE HInterID = {hmainid}";

                DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
                {
                    int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
                    // âœ… æ­£ç¡®çš„判断：HBillStatus = 2 è¡¨ç¤ºå·²å®¡æ ¸
                    if (hBillStatus == 2)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }
                else
                {
                    return new { code = "0", count = 0, Message = "单据不存在！" };
                }

                // ç›´æŽ¥æ›´æ–°æ‰˜æ•°
                string updateSql = $@"
                    UPDATE Sc_MouldOutRequestBillMain 

 WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs

@@ -414,28 +414,7 @@
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };


                string checkAuditSql = $@"
                    SELECT HBillStatus 
                    FROM Sc_MouldStockBillMain 
                    WHERE HInterID = {hmainid}";

                DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
                {
                    int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
           
                    if (hBillStatus == 2)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }
                else
                {
                    return new { code = "0", count = 0, Message = "单据不存在！" };
                }

    
         
                string updateSql = $@"
                    UPDATE Sc_MouldStockBillMain  
                    SET HPackQtys = {newPallet} 

 WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs

@@ -355,26 +355,7 @@
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };


                string checkAuditSql = $@"
                    SELECT HBillStatus 
                    FROM Sc_MouldStockBillMain
                    WHERE HInterID = {hmainid}";

                DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
                {
                    int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
              
                    if (hBillStatus == 2)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }
                else
                {
                    return new { code = "0", count = 0, Message = "单据不存在！" };
                }
     

                // ç›´æŽ¥æ›´æ–°æ‰˜æ•°
                string updateSql = $@"

 WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs

@@ -2441,6 +2441,16 @@
            {
                //保存后控制
                objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 1);
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {
                        //自动生成工作联系单
                        oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + HInterID + "," + 3847);
                    }                   
                }
             
                if (objJsonResult.count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/QC_ManagementController.cs

@@ -1353,8 +1353,21 @@
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    string sql;
                    if(HInterID=="0")
                    {
                        sql = "select top 1 * from  Gy_QCCheckProjectMain  order by HInterID desc";
                        
                    }
                    else
                     sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if(ds!=null)
                    {
                        oBill.omodel.HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]);
                        HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]).ToString();
                    }
                    
                    if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                    {
                        objJsonResult.code = "0";

 WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs

@@ -265,8 +265,9 @@
                }
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                LogService.Write(1);
                List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(msg2);

                LogService.Write(1);
                long HItemID = int.Parse(msg3);
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
@@ -288,7 +289,7 @@
                }

                DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileType Where HStopflag=0 and HNumber='" + HItemID + "' and HItemID<>" + HNumber, "Gy_EquipFileType", ref Pub_Class.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count != 0)
                if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -345,6 +346,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e);
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormImportController.cs

@@ -2019,8 +2019,12 @@
                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }
                    if (!tb2.Columns.Contains(ExcelDs.Tables[0].Rows[0][i].ToString()))
                    {
                        tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                    }
                }               

                //模板缺少列 ä½†éœ€è¦ä»Žæ•°æ®åº“中查询出来显示在页面的字段
                tb2.Columns.Add("hmainid", typeof(Int32));
                tb2.Columns.Add("HMaterID", typeof(Int32));//物料ID
@@ -2084,17 +2088,17 @@
                    tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH");


                    if (tb2.Rows[i]["组织编码*"].ToString() == "")
                    if (tb2.Rows[i]["组织编码"].ToString() == "")
                        error += "组织编码不能为空;";
                    if (tb2.Rows[i]["生产订单号*"].ToString() == "")
                    if (tb2.Rows[i]["生产订单号"].ToString() == "")
                        error += "生产订单号不能为空;\n";
                    if (tb2.Rows[i]["生产订单明细行号*"].ToString() == "")
                    if (tb2.Rows[i]["生产订单明细行号"].ToString() == "")
                        error += "生产订单明细行号不能为空;";
                    if (tb2.Rows[i]["生产车间编码*"].ToString() == "")
                    if (tb2.Rows[i]["生产车间编码"].ToString() == "")
                        error += "生产车间编码不能为空;";
                    if (tb2.Rows[i]["生产资源编码*"].ToString() == "")
                    if (tb2.Rows[i]["生产资源编码"].ToString() == "")
                        error += "生产资源编码不能为空;";
                    if (tb2.Rows[i]["物料编码*"].ToString() == "")
                    if (tb2.Rows[i]["物料编码"].ToString() == "")
                        error += "物料编码不能为空;";

                    if (error.Length > 0)
@@ -2107,15 +2111,15 @@
                    }

                    string sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where å•æ®å·='{0}' and ç”Ÿäº§è½¦é—´ä»£ç ='{1}' and äº§å“ä»£ç ='{2}' " +
                        "and æ˜Žç»†è¡Œå·={3} ",tb2.Rows[i]["生产订单号*"].ToString(), tb2.Rows[i]["生产车间编码*"].ToString(), tb2.Rows[i]["物料编码*"].ToString(), 
                        tb2.Rows[i]["生产订单明细行号*"].ToString());
                        "and æ˜Žç»†è¡Œå·={3} ",tb2.Rows[i]["生产订单号"].ToString(), tb2.Rows[i]["生产车间编码"].ToString(), tb2.Rows[i]["物料编码"].ToString(), 
                        tb2.Rows[i]["生产订单明细行号"].ToString());

                    ds = oCN.RunProcReturn(sql1, "h_v_JIT_ICMOBillList_DR");

                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        error += $"没有生产订单信息，生产订单号:{ tb2.Rows[i]["生产订单号*"].ToString()},生产车间编码:{tb2.Rows[i]["生产车间编码*"].ToString()}" +
                               $",生产订单明细行号:{ tb2.Rows[i]["生产订单明细行号*"].ToString()},物料编码:{ tb2.Rows[i]["物料编码*"].ToString()}";
                        error += $"没有生产订单信息，生产订单号:{ tb2.Rows[i]["生产订单号"].ToString()},生产车间编码:{tb2.Rows[i]["生产车间编码"].ToString()}" +
                               $",生产订单明细行号:{ tb2.Rows[i]["生产订单明细行号"].ToString()},物料编码:{ tb2.Rows[i]["物料编码"].ToString()}";
                    }

                    if (error.Length > 0)
@@ -2147,9 +2151,9 @@
                    }

                    ds = oCN.RunProcReturn("select * from h_v_JIT_WorkBillSortBillList_DR " +
                        $"where  ç”Ÿäº§è®¢å•å·='{tb2.Rows[i]["生产订单号*"].ToString()}'  and ç”Ÿäº§è®¢å•æ˜Žç»†è¡Œå·='{tb2.Rows[i]["生产订单明细行号*"].ToString()}' " +
                        $"and ç”Ÿäº§è½¦é—´ç¼–码='{tb2.Rows[i]["生产车间编码*"].ToString()}' and ç‰©æ–™ä»£ç ='{tb2.Rows[i]["物料编码*"].ToString()}' " +
                        $"and ç”Ÿäº§èµ„源编码='{tb2.Rows[i]["生产资源编码*"].ToString()}' ", "h_v_JIT_WorkBillSortBillList_DR");
                        $"where  ç”Ÿäº§è®¢å•å·='{tb2.Rows[i]["生产订单号"].ToString()}'  and ç”Ÿäº§è®¢å•æ˜Žç»†è¡Œå·='{tb2.Rows[i]["生产订单明细行号"].ToString()}' " +
                        $"and ç”Ÿäº§è½¦é—´ç¼–码='{tb2.Rows[i]["生产车间编码"].ToString()}' and ç‰©æ–™ä»£ç ='{tb2.Rows[i]["物料编码"].ToString()}' " +
                        $"and ç”Ÿäº§èµ„源编码='{tb2.Rows[i]["生产资源编码"].ToString()}' ", "h_v_JIT_WorkBillSortBillList_DR");
                    //组织编码='{tb2.Rows[i]["组织编码*"].ToString()}' and
                    //and ç”Ÿäº§èµ„源编码='{tb2.Rows[i]["生产资源编码*"].ToString()}'

@@ -2162,32 +2166,32 @@
                            tb2.Rows[i]["优先级"] = ds.Tables[0].Rows[0]["优先级"].ToString();
                        }
                        tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
                        tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
                        tb2.Rows[i]["员工编码"] = ds.Tables[0].Rows[0]["职员代码"].ToString();
                        tb2.Rows[i]["员工"] = ds.Tables[0].Rows[0]["职员"].ToString();
                        //tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
                        //tb2.Rows[i]["员工编码"] = ds.Tables[0].Rows[0]["职员代码"].ToString();
                        //tb2.Rows[i]["员工"] = ds.Tables[0].Rows[0]["职员"].ToString();
                        tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HUnitID"].ToString();
                        tb2.Rows[i]["计量单位"] = ds.Tables[0].Rows[0]["计量单位"].ToString();
                        tb2.Rows[i]["批次号"] = ds.Tables[0].Rows[0]["批次"].ToString();
                        tb2.Rows[i]["销售订单数量"] = ds.Tables[0].Rows[0]["销售订单数量"].ToString();
                        tb2.Rows[i]["总齐套数量"] = ds.Tables[0].Rows[0]["齐套数量"].ToString();
                        //tb2.Rows[i]["批次号"] = ds.Tables[0].Rows[0]["批次"].ToString();
                        //tb2.Rows[i]["销售订单数量"] = ds.Tables[0].Rows[0]["销售订单数量"].ToString();
                        //tb2.Rows[i]["总齐套数量"] = ds.Tables[0].Rows[0]["齐套数量"].ToString();
                    }
                    else
                    {
                        //员工
                        ds = oCN.RunProcReturn($"select * from Gy_Employee with(nolock) where HNumber='{tb2.Rows[i]["员工编码"].ToString()}'", "Gy_Employee");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            tb2.Rows[i]["员工"] = ds.Tables[0].Rows[0]["HName"].ToString();
                        }
                        else
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"第{i + 1}行,员工查无数据!";
                            objJsonResult.data = tb2;
                            return objJsonResult;
                        }
                        ////员工
                        //ds = oCN.RunProcReturn($"select * from Gy_Employee with(nolock) where HNumber='{tb2.Rows[i]["员工编码"].ToString()}'", "Gy_Employee");
                        //if (ds.Tables[0].Rows.Count > 0)
                        //{
                        //    tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        //    tb2.Rows[i]["员工"] = ds.Tables[0].Rows[0]["HName"].ToString();
                        //}
                        //else
                        //{
                        //    objJsonResult.code = "0";
                        //    objJsonResult.count = 0;
                        //    objJsonResult.Message = $"第{i + 1}行,员工查无数据!";
                        //    objJsonResult.data = tb2;
                        //    return objJsonResult;
                        //}

                        //计量单位
                        ds = oCN.RunProcReturn($"select * from Gy_Unit with(nolock) where HNumber='{tb2.Rows[i]["计量单位"].ToString()}'", "Gy_Unit");
@@ -2205,7 +2209,7 @@
                        }

                        //生产资源
                        ds = oCN.RunProcReturn($"select * from Gy_Source with(nolock) where HNumber='{tb2.Rows[i]["生产资源编码*"].ToString()}'", "Gy_Source");
                        ds = oCN.RunProcReturn($"select * from Gy_Source with(nolock) where HNumber='{tb2.Rows[i]["生产资源编码"].ToString()}'", "Gy_Source");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
@@ -2220,7 +2224,7 @@
                        }
                    }
                    //组织
                    ds = oCN.RunProcReturn($"select * from Xt_ORGANIZATIONS with(nolock) where HNumber='{tb2.Rows[i]["组织编码*"].ToString()}'", "Xt_ORGANIZATIONS");
                    ds = oCN.RunProcReturn($"select * from Xt_ORGANIZATIONS with(nolock) where HNumber='{tb2.Rows[i]["组织编码"].ToString()}'", "Xt_ORGANIZATIONS");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        tb2.Rows[i]["HProdORGID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
@@ -2232,25 +2236,7 @@
                        objJsonResult.Message = $"第{i + 1}行,组织查无数据!";
                        objJsonResult.data = tb2;
                        return objJsonResult;
                    }
                    if (oSystemParameter.omodel.WMS_CampanyName == "宝工")
                    {
                        string HOrgID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        //生产车间
                        ds = oCN.RunProcReturn($"select * from Gy_Department with(nolock) where HUSEORGID = {HOrgID} and HNumber='{tb2.Rows[i]["生产车间编码*"].ToString()}'", "Gy_Department");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        else
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"第{i + 1}行,生产车间查无数据!";
                            objJsonResult.data = tb2;
                            return objJsonResult;
                        }
                    }
                    }                   
                }

                objJsonResult.code = "1";
@@ -2331,9 +2317,6 @@
                    list.Add(dic);
                }




                for (int i = 0; i < list.Count; i++)
                {
                    int TrueCount = 0, SumCount = 0;
@@ -2343,22 +2326,22 @@
                    {
                        HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
                        HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                        var HICMOBillNo = list[i]["生产订单号*"].ToString();
                        var HICMOEntrySEQ = list[i]["生产订单明细行号*"].ToString();
                        var HICMOBillNo = list[i]["生产订单号"].ToString();
                        var HICMOEntrySEQ = list[i]["生产订单明细行号"].ToString();
                        var HProdORGID = list[i]["HProdORGID"].ToString();
                        var HWorkShopID = list[i]["HWorkShopID"].ToString();
                        var HSourceID = list[i]["HSourceID"].ToString();
                        var HWorkQty = DBUtility.ClsPub.isDoule(list[i]["产能"]);
                        var HWorkQty = DBUtility.ClsPub.isDoule(list[i]["产线总产能"]);
                        var HYX = list[i]["优先级"].ToString();
                        var HEmpID = list[i]["HEmpID"].ToString();
                        var HMaterID = list[i]["HMaterID"].ToString();
                        var HMaterName = list[i]["物料名称"].ToString();
                        var HMaterModel = list[i]["规格型号"].ToString();
                        var HUnitID = list[i]["HUnitID"].ToString();
                        var HBatchNo = list[i]["批次号"].ToString();
                        var HSeOrderBillQty = list[i]["销售订单数量"].ToString();
                        var HBatchNo = ""; // list[i]["批次号"].ToString();
                        var HSeOrderBillQty = "0"; // list[i]["销售订单数量"].ToString();
                        var HPlanQty = list[i]["生产订单数量"].ToString();
                        var HCompleteQty = list[i]["总齐套数量"].ToString();
                        var HCompleteQty = "0"; // list[i]["总齐套数量"].ToString();
                        var HOrderType = omdelMian.HOrderType;
                        var HDate = omdelMian.HDate;
                        var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
@@ -2396,7 +2379,7 @@
                            $",'{HSeOrderBillNo}','{HVersion_Import}')");
                    }

                    int SumDay = 31; //动态两月之差 DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
                    int SumDay = 50; //动态两月之差 DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;

                    // ç»Ÿè®¡æ€»å¤©æ•°
                    HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
@@ -2417,7 +2400,7 @@
                        LogService.Write("1:" + list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString());
                        LogService.Write("2:" + DateTime.Now.AddDays(j).ToString("yyyy-MM-dd"));
                        //主表子表都有数据
                        if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
                        if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "" && Math.Round(double.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()), 1) > 0)
                        {
                            SumCount += 1;
                            ////保存子表

 WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs

@@ -354,16 +354,13 @@
        [HttpGet]
        public object APP_Edit_json(int HInterID, string HBarCode)
        {
            oCN.BeginTran();
            DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");
            //DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='" + HBarCode + "'", "Gy_EquipFileBillMain");
            DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");            
            if (ds != null || ds.Tables.Count > 0)
            {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = ds.Tables;
                    oCN.Commit();
                    return objJsonResult;
                
            }
@@ -375,7 +372,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
            return objJsonResult;
        }
        #endregion


 WebAPI/Controllers/Æ·ÖʹÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_TakeSampleCheckBillController.cs

@@ -261,6 +261,15 @@
                {
                   
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                        {
                            //自动生成工作联系单
                            oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + BillOld.omodel.HInterID + "," + 7521);
                        }
                    }
                }
                else if (refSav == "Update")
                {

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs

@@ -404,6 +404,15 @@
                if (OperationType.Equals("1") || OperationType.Equals("2"))
                {
                    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                        {
                            //自动生成工作联系单
                            oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 7505);
                        }
                    }                    
                }
                else
                {
@@ -1463,6 +1472,118 @@
        }
        #endregion

        #region é¦–件检验单根据源单类型获取信息-源单为取样单
        [Route("QC_FirstPieceCheckBill/get_TakeSampleCheckBill")]
        [HttpGet]
        public object get_TakeSampleCheckBill(string HInterID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList " + "'工序','" + HInterID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList " + "'物料','" + HInterID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList " + "'工艺路线','" + HInterID + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetTakeSampleCheckBillList");

                //添加列名
                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 = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é¦–件检验单根据源单类型获取信息-源单为取样单 æ ¹æ®å•æ®å·æŸ¥è¯¢
        [Route("QC_FirstPieceCheckBill/get_TakeSampleCheckBill_ByBillNo")]
        [HttpGet]
        public object get_TakeSampleCheckBill_ByBillNo(string HBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList_ByHBillNo " + "'工序','" + HBillNo + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList_ByHBillNo " + "'物料','" + HBillNo + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_FirstPiece_GetTakeSampleCheckBillList_ByHBillNo " + "'工艺路线','" + HBillNo + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetTakeSampleCheckBillList_ByHBillNo");

                //添加列名
                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 = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é¦–件 æ ¹æ®å·¥åºæˆ–者生产资源去查询数据
        [Route("CheckBill/GetICMOBillStatusList")]
        [HttpGet]

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DotCheckItemClassController.cs

@@ -164,7 +164,7 @@
                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select TOP 1 HItemID from Gy_DotCheckItemClass where HStopflag = 0 and HNumber = '" + oItem.HNumber.Trim() + "'and HItemID != " + HItemID, "Gy_DotCheckItemClass");

                    if(ds.Tables[0].Rows[0] != null && ds.Tables[0].Rows[0]["HItemID"] != null)
                    if(ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;

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

@@ -684,7 +684,8 @@
                //保存
                bool bResult;
                bResult = BillNew.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                //自动生成工作联系单
                oCn.RunProc("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 3802);
                if (bResult)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/ÎïÁ÷¹ÜÀí/Ô˵¥·ÑÓýáËãµ¥/Pay_WayBillPaymentBillController.cs

New file
@@ -0,0 +1,953 @@
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 Pay_WayBillPaymentBillController : ApiController
    {
        //其他应付单
        //获取系统参数    YF_PayMentOtherBillMain     YF_PayMentOtherBill
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        public DAL.ClsPay_WayBillPaymentBill BillOld = new DAL.ClsPay_WayBillPaymentBill();
        public DAL.ClsPay_WayBillPaymentBill BillNew0 = new DAL.ClsPay_WayBillPaymentBill();

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

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

                //添加列名
                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("Pay_WayBillPaymentBillController/saveBILL")]
        [HttpPost]
        public object saveBILL([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString(); //子表
            string refSav = sArray[2].ToString();//操作方式数据类型 1添加 3修改 2 å¤åˆ¶
            string msg4 = sArray[3].ToString();//用户名

            DBUtility.ClsPub.CurUserName = msg4;

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

                DAL.ClsPay_WayBillPaymentBill oBill = new DAL.ClsPay_WayBillPaymentBill();
                List<Model.ClsPay_WayBillPaymentBillMain> lsmain = new List<Model.ClsPay_WayBillPaymentBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Pay_WayBillPaymentBillMain(msg2);
                foreach (Model.ClsPay_WayBillPaymentBillMain oItem in lsmain)
                {
                    if (refSav == "Add")
                    {
                        //单据号是否重复
                        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 (refSav == "Update")
                    {
                        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;
                        }
                    }
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "2102";
                    oItem.HBillSubType = "2102";

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

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }

                // è¡¨ä½“数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsPay_WayBillPaymentBillSub> ls = new List<Model.ClsPay_WayBillPaymentBillSub>();
                ls = oListModels.getObjectByJson_Pay_WayBillPaymentBillSub(msg3);
                int i = 0;
                foreach (Model.ClsPay_WayBillPaymentBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;


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

                    oBill.DetailColl.Add(oItemSub);

                }

                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                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;
                }

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

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

        #region  ç¼–辑页面初始化
        [Route("Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillEditList")]
        [HttpGet]
        public object Pay_WayBillPaymentBillEditList(long HInterID)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                ds = oCN.RunProcReturn("select * from h_v_Pay_WayBillPaymentBillEdit where HInterID=  " + HInterID, "h_v_Pay_WayBillPaymentBillEdit");
                tableList.Add(ds.Tables[0]);
                //tableList.Add(ds.Tables[1]);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = tableList;
                    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("Pay_WayBillPaymentBillController/DeleteBillMain")]
        [HttpGet]
        public object DeleteBillMain(string HInterID, string user)
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("YF_PayMentOtherBill_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_YF_PayMentOtherBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_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 YF_PayMentOtherBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from YF_PayMentOtherBillSub where HInterID= " + HInterID);

                //删除后控制==================================================================================      
                string sql2 = "exec h_p_YF_PayMentOtherBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql2, "h_p_YF_PayMentOtherBill_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 = "删除成功";
                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("Pay_WayBillPaymentBillController/AuditYF_PayMentOtherBillMain")]
        [HttpGet]
        public object AuditYF_PayMentOtherBillMain(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "YF_PayMentOtherBill_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.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill();                              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                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;
                    }


                    oCN.BeginTran();

                    //记录返回信息
                    string msg = "";



                    //审核前控制=========================================      
                    string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_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;
                        oCN.RollBack();
                        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;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==================================================================================      


                    //审核提交
                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功！" + msg;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        oCN.RollBack();

                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //反审核提交
                {

                    //反审核前控制=========================================        
                    string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl");
                    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;
                    }
                    //===========================================================          

                    //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                    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;
                    }

                    //反审核提交AbandonCheck
                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterUnCheckCtrl", CurUserName, 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)
            {
                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("Pay_WayBillPaymentBillController/CloseYF_PayMentOtherBill")]
        [HttpGet]
        public object CloseYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "YF_PayMentOtherBill_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.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill();              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                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("YF_PayMentOtherBill/DeleteYF_PayMentOtherBill")]
        [HttpGet]
        public object DeleteYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "YF_PayMentOtherBill_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.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill();              //实例化单据操作类，用于进行相关操作

                //针对需要进行的操作，检验当前单据的状态是否支持需要进行的操作
                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 (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/ListModels.cs

@@ -2015,6 +2015,29 @@
            List<Model.ClsYF_PayMentOtherBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增结算应付单表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPay_WayBillPaymentBillMain> getObjectByJson_Pay_WayBillPaymentBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPay_WayBillPaymentBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// å¤„理新增结算子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPay_WayBillPaymentBillSub> getObjectByJson_Pay_WayBillPaymentBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPay_WayBillPaymentBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// å¤„理新增模具保养记录表主表的json

 WebAPI/Models/ClsGy_EquipFileType.cs

@@ -18,14 +18,14 @@
        public string HRemark;      //备注 varchar(50)   
        public string HHelpCode;        //助记码  varchar(20)
        public string HUseFlag="未使用";     //使用状态（未检测，未使用，已使用）
        public DateTime HMakeTime;          //建立时间(getdate())	
        public string HMakeTime;          //建立时间(getdate())	
        public string HMakeEmp;     //创建人            
        public string HCheckEmp;        //审核人
        public DateTime HCheckTime;            //审核时间
        public string HCheckTime;            //审核时间
        public string HModifyEmp;       //修改人
        public DateTime HModifyTime;            //修改时间
        public string HModifyTime;            //修改时间
        public string HStopEmp;     //禁用人
        public DateTime HStopTime;            //禁用时间
        public string HStopTime;            //禁用时间

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2026-01-15T09:33:04.8867687Z;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
    <History>True|2026-01-19T09:23:36.9963060Z;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,31 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/14/2026 10:23:35</publishTime>
      <publishTime>01/19/2026 17:18:35</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>01/14/2026 10:23:35</publishTime>
      <publishTime>01/19/2026 17:18:35</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/14/2026 10:23:24</publishTime>
      <publishTime>01/19/2026 17:18:27</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/14/2026 10:23:24</publishTime>
      <publishTime>01/19/2026 17:18:27</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/14/2026 10:23:10</publishTime>
      <publishTime>01/19/2026 17:18:22</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>01/14/2026 10:23:10</publishTime>
      <publishTime>01/19/2026 17:18:22</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +114,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/14/2026 10:23:14</publishTime>
      <publishTime>01/19/2026 17:18:24</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/14/2026 10:23:14</publishTime>
      <publishTime>01/19/2026 17:18:24</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/23/2025 10:00:25</publishTime>
@@ -147,34 +150,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/14/2026 10:23:02</publishTime>
      <publishTime>01/19/2026 17:18:19</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>01/14/2026 10:23:02</publishTime>
      <publishTime>01/19/2026 17:18:19</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/14/2026 10:23:06</publishTime>
      <publishTime>01/19/2026 17:18:20</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>01/14/2026 10:23:06</publishTime>
      <publishTime>01/19/2026 17:18:20</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/14/2026 10:23:07</publishTime>
      <publishTime>01/19/2026 17:18:20</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>01/14/2026 10:23:07</publishTime>
      <publishTime>01/19/2026 17:18:20</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/12/2026 17:50:25</publishTime>
      <publishTime>01/19/2026 17:10:15</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/12/2026 17:50:25</publishTime>
      <publishTime>01/19/2026 17:10:15</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +288,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/12/2026 17:50:26</publishTime>
      <publishTime>01/19/2026 17:10:40</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/12/2026 17:50:26</publishTime>
      <publishTime>01/19/2026 17:10:40</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>01/15/2026 17:41:12</publishTime>
      <publishTime>01/19/2026 17:23:35</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>01/15/2026 17:41:12</publishTime>
      <publishTime>01/19/2026 17:23:35</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>07/01/2025 16:53:56</publishTime>
@@ -390,7 +393,7 @@
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>12/30/2025 14:17:55</publishTime>
      <publishTime>01/15/2026 17:49:03</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/10/2025 17:08:59</publishTime>
@@ -504,7 +507,7 @@
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>01/14/2026 10:24:02</publishTime>
      <publishTime>01/16/2026 14:14:33</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\gz\网站发布\MES-WEB-API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user

New file
@@ -0,0 +1,522 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2026-01-19T08:39:45.2711197Z;True|2026-01-19T16:21:02.6483395+08:00;False|2026-01-19T16:20:38.8982697+08:00;</History>
    <_PublishTargetUrl>D:\gz\网站发布\MES-WEB-API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 17:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 20:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 18:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 11:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 19:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 20:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 21:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 10:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/19/2026 16:20:52</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>01/19/2026 16:20:52</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/19/2026 16:20:50</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/19/2026 16:20:50</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
    </File>
    <File Include="bin/GetuiServerApiSDK.dll">
      <publishTime>01/19/2026 16:14:36</publishTime>
    </File>
    <File Include="bin/GetuiServerApiSDK.dll.config">
      <publishTime>01/19/2026 16:14:36</publishTime>
    </File>
    <File Include="bin/Google.ProtocolBuffers.dll">
      <publishTime>01/19/2026 16:14:36</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/19/2022 07:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 13:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/19/2022 07:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/19/2015 01:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/19/2026 16:20:48</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/19/2026 16:20:48</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/19/2026 16:20:46</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>01/19/2026 16:20:46</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>01/19/2026 16:20:47</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/19/2026 15:35:44</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/19/2026 15:35:44</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Configuration.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Data.DataSetExtensions.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Data.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Drawing.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.EnterpriseServices.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 18:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/18/2019 00:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Extensions.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 21:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.ApplicationServices.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 20:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.DynamicData.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Entity.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Extensions.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 21:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 23:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 12:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Xml.Linq.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/19/2026 16:14:36</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/19/2026 16:14:36</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>01/19/2026 16:39:41</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>01/19/2026 16:39:41</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>01/19/2026 16:39:44</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 21:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>12/17/2025 13:18:47</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>11/12/2025 10:43:48</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/19/2026 15:12:26</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/09/2025 08:11:33</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Utility/Barcode.ashx">
      <publishTime>12/17/2025 13:18:47</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>01/19/2026 16:21:01</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj

@@ -682,6 +682,7 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_ShelfLifeNearExpiryController.cs" />
    <Compile Include="Controllers\检验申请单\QC_RequestCheckBillController.cs" />
    <Compile Include="Controllers\物流管理\出运单\WLYayBillController.cs" />
    <Compile Include="Controllers\物流管理\运单费用结算单\Pay_WayBillPaymentBillController.cs" />
    <Compile Include="Controllers\项目管理\工程项目\PM_ProjectBill_WorkController.cs" />
    <Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
    <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />

 WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|x86</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 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

@@ -16,3 +16,18 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
<<<<<<< HEAD
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\gz\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.AssemblyReference.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
>>>>>>> dbb4487be15ef158326d46bb81b6284987e35a2c

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ