MES-WEB-API.git

parent: f6671c0b | 补丁 | 提交 | ignore whitespace

duhe

1 天以前 16593a5ca1e6b7f84a3e1aa140407cee9b1f5ab6

30个文件已修改

1个文件已添加

	APSM/APSM.csproj.user	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DAL/基础资料/公用基础资料/ClsGy_MouldFile.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DAL/车间管理/ClsGy_MaterPreventErrMouldBillMain.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DAL/车间管理/ClsQc_PreventErrMouldCheckBillMain.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/基础资料/基础资料/ClsGy_MouldFileMain.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/车间管理/ClsGy_MaterPreventErrMouldBillSub.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/车间管理/ClsQc_PreventErrMouldCheckBillSub.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Pub_Class/CustomerCls/ClsXt_SystemParameter.cs	80 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/bin/Debug/SyntacticSugar.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/bin/Debug/SyntacticSugar.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/BaseSet/Gy_MaterialController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/LMESController.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/SCGL/日计划管理/Xs_SendGoodsPlanBillController.cs	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/WebAPIController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/品质管理/车间自检单/QC_WorkSelfCheckBillController.cs	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/基础资料/基础资料/Xt_FastICSchemeController.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/条码管理/WEBSController.cs	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Models/Gy_Mould.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj.user	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 APSM/APSM.csproj.user

New file
@@ -0,0 +1,6 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ProjectFiles</ProjectView>
  </PropertyGroup>
</Project>

 DAL/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/ClsGy_MouldFile.cs

@@ -79,6 +79,8 @@
                ",HLeaveLife=" + omodel.HLeaveLife.ToString() +
                ",HProdQty=" + omodel.HProdQty.ToString() +
                ",HProdWeight=" + omodel.HProdWeight.ToString() +
                ",HNextMainDate='" + omodel.HNextMainDate + "'" +
                
                " where HInterID=" + lngBillKey.ToString());
                //å é¤å³è
                DeleteRelation(ref sReturn, lngBillKey);
@@ -151,7 +153,7 @@
                ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HNextMainDate" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
@@ -161,7 +163,7 @@
                ",'" + omodel.HOutComDate + "','" + omodel.HOutComNo + "'," + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HSupNumber + "'" +
                "," + omodel.HPrintQty.ToString() + ",'" + omodel.HMouldStatus + "'," + omodel.HWhID.ToString() + "," + omodel.HRoutingID.ToString() +
                "," + omodel.HBomID.ToString() + ",'" + omodel.HVersion + "'," + omodel.HSPGroupID.ToString() + "," + omodel.HSPID.ToString() + "," + omodel.HDesignLife.ToString() +
                "," + omodel.HUseLife.ToString() + "," + omodel.HLeaveLife.ToString() + "," + omodel.HProdQty.ToString() + "," + omodel.HProdWeight.ToString() + 
                "," + omodel.HUseLife.ToString() + "," + omodel.HLeaveLife.ToString() + "," + omodel.HProdQty.ToString() + "," + omodel.HProdWeight.ToString() + "," + omodel.HNextMainDate.ToString() +
                ") ");
                //
                //æå¥åè¡¨

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

@@ -79,7 +79,7 @@
                {
                    string subSql = "insert into Gy_MaterPreventErrMouldBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
@@ -92,6 +92,7 @@
                        "','" + oSub.HPreventErrNote +
                        "','" + oSub.HLoseMode +
                        "','" + oSub.HLoseCheck +
                        "','" + oSub.HPreventErrResult +
                        "')";
                    oCn.RunProc(subSql);
                }
@@ -189,7 +190,7 @@
                {
                    string subSql = "insert into Gy_MaterPreventErrMouldBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
@@ -202,6 +203,7 @@
                        "','" + oSub.HPreventErrNote +
                        "','" + oSub.HLoseMode +
                        "','" + oSub.HLoseCheck +
                        "','" + oSub.HPreventErrResult +
                        "')";
                    oCn.RunProc(subSql);
                }

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

@@ -80,7 +80,7 @@
                {
                    string subSql = "insert into Qc_PreventErrMouldCheckBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult,HPreventErrResult) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
@@ -94,6 +94,7 @@
                        "','" + oSub.HLoseMode +
                        "','" + oSub.HLoseCheck +
                        "','" + oSub.HCheckResult +
                        "','" + oSub.HPreventErrResult +
                        "')";
                    oCn.RunProc(subSql);
                }
@@ -195,7 +196,7 @@
                {
                    string subSql = "insert into Qc_PreventErrMouldCheckBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult,HPreventErrResult) " +
                        " values(" +
                        "" + omodel.HInterID.ToString() +
                        "," + oSub.HEntryID.ToString() +
@@ -209,6 +210,7 @@
                        "','" + oSub.HLoseMode +
                        "','" + oSub.HLoseCheck +
                        "','" + oSub.HCheckResult +
                        "','" + oSub.HPreventErrResult +
                        "')";
                    oCn.RunProc(subSql);
                }

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_MouldFileMain.cs

@@ -50,5 +50,6 @@
        public string HBarCode;
        public string HInitModel;
        public string HSaveLife;
        public DateTime HNextMainDate;
    }
}

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

@@ -10,6 +10,6 @@
        public string HPreventErrNote;     // varchar(200) --é²éåè½
        public string HLoseMode;     //varchar(200) --Ê§Ð§Ä£Ê½
        public string HLoseCheck;     // varchar(200) --å¤±æéªè¯æ¹æ³

        public string HPreventErrResult;     // varchar(200) --é²éç»æ
    }
}

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

@@ -10,6 +10,7 @@
        public string HPreventErrNote;         //varchar(200) --é²éåè½
        public string HLoseMode;     // varchar(200) --Ê§Ð§Ä£Ê½
        public string HLoseCheck;   //varchar(200) --å¤±æéªè¯æ¹æ³
        public string HPreventErrResult;     // varchar(200) --é²éç»æ
        public string HCheckResult; //varchar(20)  --ç»æï¼OKï¼Xï¼

    }

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -246,6 +246,10 @@
                    {
                        omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
                    {
                        omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -327,6 +331,10 @@
                    {
                        omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
                    {
                        omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -403,6 +411,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
                    {
@@ -543,6 +555,10 @@
                    {
                        omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
                    {
                        omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -636,6 +652,10 @@
                    {
                        omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
                    {
                        omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -716,6 +736,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
                    {
@@ -802,6 +826,10 @@
                    {
                        omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
                    {
                        omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -883,6 +911,10 @@
                    {
                        omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -963,6 +995,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
                    {
@@ -1048,6 +1084,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
                    {
@@ -2576,6 +2616,10 @@
                    {
                        omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
                    {
                        omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2657,6 +2701,10 @@
                    {
                        omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
                    {
                        omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2733,6 +2781,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
                    {
                        omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
                    {
@@ -2873,6 +2925,10 @@
                    {
                        omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
                    {
                        omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2966,6 +3022,10 @@
                    {
                        omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
                    {
                        omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3046,6 +3106,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
                    {
@@ -3132,6 +3196,10 @@
                    {
                        omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
                    {
                        omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3213,6 +3281,10 @@
                    {
                        omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3293,6 +3365,10 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
                    {
@@ -3379,6 +3455,10 @@
                    {
                        omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
                    {
                        omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
                    {
                        omodel.Kf_MoveStockBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -56,6 +56,7 @@
        public string Kf_POStockInBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_POStockInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_POStockInBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_POStockInBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_POStockInBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //äº§åå¥åº
@@ -79,6 +80,7 @@
        public string Kf_ProductInBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_ProductInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_ProductInBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_ProductInBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_ProductInBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //å¶ä»å¥åº
@@ -101,6 +103,7 @@
        public string Kf_OtherInBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_OtherInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_OtherInBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_OtherInBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_OtherInBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //å§å¤å¥åº
@@ -142,6 +145,7 @@
        public string Kf_MateOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_MateOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_MateOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_MateOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_MateOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //éå®åºåº
@@ -168,6 +172,7 @@
        public string Kf_SellOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_SellOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_SellOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_SellOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_SellOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //å¶ä»åºåº
@@ -191,6 +196,7 @@
        public string Kf_OtherOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_OtherOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_OtherOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_OtherOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_OtherOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //å§å¤åºåº
@@ -215,6 +221,7 @@
        public string Kf_EntrustOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_EntrustOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_EntrustOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_EntrustOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_EntrustOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //çäº§è¡¥æ
@@ -238,6 +245,7 @@
        public string Kf_MateReplenishOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_MateReplenishOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_MateReplenishOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_MateReplenishOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_MateReplenishOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //å§å¤è¡¥æ
@@ -261,6 +269,7 @@
        public string Kf_EntrustReplenishOutBillCheck_WHSPCtl;      //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_EntrustReplenishOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_EntrustReplenishOutBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_EntrustReplenishOutBillCheck_ERPMode;      //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //ç´æ¥è°æ¨
@@ -285,6 +294,7 @@
        public string Kf_MoveStockBillCheck_WHSPCtl;        //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
        public string Kf_MoveStockBillCheck_MultilineCtl;   //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
        public string Kf_MoveStockBillCheck_SourceBarCodeCtl;   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
        public string Kf_MoveStockBillCheck_AutoBarCode;  //åæ«ç æ¨¡å¼
        public string Kf_MoveStockBillCheck_ERPMode;        //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

        //åæ¥å¼è°åºå

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

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

@@ -4,3 +4,16 @@
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
<<<<<<< HEAD
=======
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
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
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
>>>>>>> f4774e963a8375f13d87e8ad605362cc113aee83

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -2665,6 +2665,7 @@
                int HNowSPID = mainList[0].HNowSPID;
                string HMouldUseStatus = mainList[0].HMouldUseStatus;
                int HUSEORGID = mainList[0].HUSEORGID;
                DateTime HNextMainDate = mainList[0].HNextMainDate;
                //è¥MAINDIéå¤åéæ°è·å
                oCN.BeginTran();

@@ -2745,6 +2746,7 @@
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                ",HInitLife='" + HInitLife +
                ",HNextMainDate='" + HNextMainDate +
                "',HMouldUseStatus='" + HMouldUseStatus +
                "' where HInterID=" + HInterID.ToString());


 WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs

@@ -1039,6 +1039,9 @@
                if (!tb2.Columns.Contains("å¤±æéªè¯æ¹æ³"))
                    error += "æ²¡ææ¾å°ãå¤±æéªè¯æ¹æ³ãçæ é¢,";

                if (!tb2.Columns.Contains("é²éç»æ"))
                    error += "æ²¡ææ¾å°ãé²éç»æãçæ é¢,";

                if (!tb2.Columns.Contains("è¡¨ä½å¤æ³¨"))
                    error += "æ²¡ææ¾å°ãè¡¨ä½å¤æ³¨ãçæ é¢,";

@@ -1267,6 +1270,7 @@
                    string HPreventErrNote = item["é²éåè½"].ToString();
                    string HLoseMode = item["å¤±ææ¨¡å¼"].ToString();
                    string HLoseCheck = item["å¤±æéªè¯æ¹æ³"].ToString();
                    string HPreventErrResult = item["é²éç»æ"].ToString();

                    ds = oCN.RunProcReturn("select * from Gy_MaterPreventErrMouldBillMain where HBillNo='" + HBillNo + "'", "Gy_MaterPreventErrMouldBillMain");

@@ -1294,7 +1298,7 @@
                        //æå¥åè¡¨
                        oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
                        " values(" +
                        "" + HInterID.ToString() +
                        "," + 1 +
@@ -1307,6 +1311,7 @@
                        "','" + HPreventErrNote +
                        "','" + HLoseMode +
                        "','" + HLoseCheck +
                        "','" + HPreventErrResult +
                        "')");
                    }
                    else
@@ -1322,7 +1327,7 @@
                        //æå¥åè¡¨
                        oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
                        ",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
                        " values(" +
                        "" + HInterID.ToString() +
                        "," + HEntryID +
@@ -1335,6 +1340,7 @@
                        "','" + HPreventErrNote +
                        "','" + HLoseMode +
                        "','" + HLoseCheck +
                        "','" + HPreventErrResult +
                        "')");
                    }


 WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs

@@ -165,7 +165,7 @@
                    return objJsonResult;
                }

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

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -261,8 +261,8 @@

                    }
                    UserName = oItem.HMaker;  //å¶åäºº
                    oItem.HBillType = "3744";
                    oItem.HBillSubType = "3744";
                    oItem.HBillType = "7517";
                    oItem.HBillSubType = "7517";




 WebAPI/Controllers/LMESController.cs

@@ -4188,5 +4188,36 @@
            }
        }
        #endregion

        #region æ´æ°app
        /// <summary>
        ///åæ°ï¼string HInterIDã
        ///è¿åå¼ï¼objectã
        /// </summary>
        [Route("LMES/AppUpdate")]
        [HttpGet]
        public object AppUpdate(string Type)
        {
            try
            {
                DataSet ds;
                ds = oCN.RunProcReturn("exec h_p_Gy_APPUpdateInformation " + Type , "h_p_Gy_APPUpdateInformation");

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

 WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs

@@ -221,6 +221,7 @@
                    oItem.HBillType = "3845";
                    oItem.HBillSubType = "3845";
                    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"));
                    oItem.HMaker = user;
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")

 WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs

@@ -442,7 +442,7 @@
                    BillOld.MvarItemKey = "Sc_MouldUpperBillMain";
                    //å é¤åæ§å¶=========================================
                    DataSet ds2;
                    string sql1 = "exec h_p_Sc_MouldUpperBill_BeforeDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    string sql1 = "exec h_p_Sc_MouldUpperBill_BeforeDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    ds2 = oCN.RunProcReturn(sql1, "h_p_Sc_MouldUpperBill_BeforeDelCtrl");
                    if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
                    {
@@ -470,7 +470,7 @@
                    oCN.RunProc("delete from Sc_MouldUpperBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);

                    //å é¤åæ§å¶=========================================      
                    string sql2 = "exec h_p_Sc_MouldUpperBill_AfterDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    string sql2 = "exec h_p_Sc_MouldUpperBill_AfterDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    ds2 = oCN.RunProcReturn(sql2, "h_p_Sc_MouldUpperBill_AfterDelCtrl");
                    if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
                    {
@@ -1432,7 +1432,7 @@
                    BillOld.MvarItemKey = "Sc_MouldLowerBillMain";
                    //å é¤åæ§å¶=========================================
                    DataSet ds2;
                    string sql1 = "exec h_p_Sc_MouldLowerBill_BeforeDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    string sql1 = "exec h_p_Sc_MouldLowerBill_BeforeDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    ds2 = oCN.RunProcReturn(sql1, "h_p_Sc_MouldLowerBill_BeforeDelCtrl");
                    if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
                    {
@@ -1461,7 +1461,7 @@
                    oCN.RunProc("delete from Sc_MouldLowerBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);

                    //å é¤åæ§å¶=========================================      
                    string sql2 = "exec h_p_Sc_MouldLowerBill_AfterDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    string sql2 = "exec h_p_Sc_MouldLowerBill_AfterDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
                    ds2 = oCN.RunProcReturn(sql2, "h_p_Sc_MouldLowerBill_AfterDelCtrl");
                    if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
                    {

 WebAPI/Controllers/SCGL/ÈÕ¼Æ»®¹ÜÀí/Xs_SendGoodsPlanBillController.cs

@@ -332,6 +332,14 @@
                        }
                        oCN.Commit();//ç»æäºå¡
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "å½ååæ®ä¸åå¨,æ æ³å é¤ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -339,50 +347,8 @@
                objJsonResult.data = null;
                return objJsonResult;
                
                //else if (DataType == 2)
                //{
                //    var NumData = HInterID.Split(',');

                //    //è·åç³»ç»åæ°
                //    string sReturn = "";
                //    oSystemParameter.ShowBill(ref sReturn);

                //    for (int i = 0; i < NumData.Length; i++)
                //    {
                        
                //        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");

                //        if (ds.Tables[0].Rows.Count > 0)
                //        {
                //            if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() != "1")
                //            {
                //                objJsonResult.code = "0";
                //                objJsonResult.count = 0;
                //                objJsonResult.Message = "å½ååæ®ä¸è½å é¤ï¼";
                //                objJsonResult.data = null;
                //                return objJsonResult;
                //            }

                //            oCN.BeginTran();//å¼å¯äºå¡

                //            oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData[i]}");

                //            oCN.Commit();//ç»æäºå¡
                //        }
                        
                //    }
                //    objJsonResult.code = "1";
                //    objJsonResult.count = 1;
                //    objJsonResult.Message = "å é¤æåï¼";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "å½ååæ®ä¸åå¨,æ æ³å é¤ï¼";
                objJsonResult.data = null;
                return objJsonResult;
                
            }
            catch (Exception e)
            {

 WebAPI/Controllers/WebAPIController.cs

@@ -19968,7 +19968,7 @@
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
                    objjson.Message = "è·åå¤±è´¥,æªè®¾ç½®é»è®¤æ£éªæ¹æ¡";
                    objjson.data = null;
                    return objjson;
                }

 WebAPI/Controllers/Æ·ÖÊ¹ÜÀí/³µ¼ä×Ô¼ìµ¥/QC_WorkSelfCheckBillController.cs

@@ -323,7 +323,26 @@
                }
                else
                {
                    if (BillOld.ShowBill(mainList[0].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;
                    }

                    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
                    //bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
                }
                //æç¤º
                if (bResult == true)
@@ -516,7 +535,7 @@
                oBill.MvarItemKey = "QC_WorkSelfCheckBillMain";

                //éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
                if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))                    //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
                if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
                {
                    if (oBill.omodel.HCloseMan.Trim() != "")
                    {
@@ -1017,7 +1036,24 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                var s = "";
                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;
                }

                //å¼å§äºç©
                oCN.BeginTran();                   

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

@@ -203,7 +203,6 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-1-051]Exceptionï¼" + e.Message;

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

@@ -5913,6 +5913,7 @@
            string sJXCode = "";
            if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
            {
                string sAutoBarCode = "N";        //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                string sSourceBarCodeCtl = "N";   //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼

                #region ç³»ç»åæ°è·å
@@ -5924,6 +5925,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_POStockInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //çäº§å¥åºå
                if (HBillType == "1202")
@@ -5932,6 +5938,11 @@
                    if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_ProductInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //å¶ä»å¥åºå
@@ -5942,6 +5953,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_OtherInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //é¢æåºåºå
                else if (HBillType == "1204")
@@ -5950,6 +5966,11 @@
                    if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //éå®åºåºå
@@ -5960,6 +5981,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //å¶ä»åºåºå
                else if (HBillType == "1206")
@@ -5968,6 +5994,11 @@
                    if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //å§å¤é¢æå
@@ -5978,6 +6009,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //çäº§è¡¥æå
                else if (HBillType == "1254")
@@ -5986,6 +6022,11 @@
                    if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //å§å¤è¡¥æå
@@ -5996,6 +6037,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //ç´æ¥è°æ¨å
                else if (HBillType == "1207")
@@ -6004,6 +6050,11 @@
                    if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                #endregion
@@ -6018,8 +6069,17 @@
                }
                try
                {
                    //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
                    if (sAutoBarCode == "Y")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "åæ«ç©ææ¡ç æ¨¡å¼ï¼æ éæ«æç©ææ¡ç ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //ååæ®ä¸ºæ«ç çæï¼æ ¡éªæ¶ä¸çææ¡ç è®°å½ï¼åªå¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
                    if (sSourceBarCodeCtl == "Y")
                    else if (sSourceBarCodeCtl == "Y")
                    {
                        WebSoBar = oWebs.get_BillBarCode_Verify(HBillID, HBillNo, HBillType, sJXCode, HQty, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                        if (WebSoBar == null)

 WebAPI/Models/Gy_Mould.cs

@@ -73,5 +73,6 @@
        public double HInitLife { get; set; }
        public string HMouldUseStatus { get; set; }

        public DateTime HNextMainDate { get; set; }
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2025-06-30T07:07:20.0280664Z;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2025-07-18T06:36:12.8758873Z;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\ç½ç«åå¸\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>06/30/2025 15:05:36</publishTime>
      <publishTime>07/18/2025 14:34:19</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/30/2025 15:05:36</publishTime>
      <publishTime>07/18/2025 14:34:19</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/30/2025 15:05:33</publishTime>
      <publishTime>07/18/2025 14:34:16</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/30/2025 15:05:33</publishTime>
      <publishTime>07/18/2025 14:34:16</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>06/30/2025 15:05:26</publishTime>
      <publishTime>07/18/2025 14:34:09</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/30/2025 15:05:26</publishTime>
      <publishTime>07/18/2025 14:34:09</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/30/2025 15:05:27</publishTime>
      <publishTime>07/18/2025 14:34:10</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/30/2025 15:05:27</publishTime>
      <publishTime>07/18/2025 14:34:10</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>06/30/2025 15:05:24</publishTime>
      <publishTime>07/18/2025 14:34:06</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>06/30/2025 15:05:24</publishTime>
      <publishTime>07/18/2025 14:34:06</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>06/30/2025 15:05:25</publishTime>
      <publishTime>07/18/2025 14:34:07</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>06/30/2025 15:05:25</publishTime>
      <publishTime>07/18/2025 14:34:07</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/30/2025 15:05:24</publishTime>
      <publishTime>07/18/2025 14:34:07</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/30/2025 15:05:24</publishTime>
      <publishTime>07/18/2025 14:34:07</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>06/27/2025 15:25:37</publishTime>
      <publishTime>07/18/2025 14:34:02</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>06/27/2025 15:25:37</publishTime>
      <publishTime>07/18/2025 14:34:02</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>06/27/2025 15:25:45</publishTime>
      <publishTime>07/18/2025 14:34:10</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>06/27/2025 15:25:45</publishTime>
      <publishTime>07/18/2025 14:34:10</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/30/2025 15:05:45</publishTime>
      <publishTime>07/18/2025 14:34:29</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/30/2025 15:05:45</publishTime>
      <publishTime>07/18/2025 14:34:29</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/30/2025 15:07:16</publishTime>
      <publishTime>07/18/2025 14:34:49</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj

@@ -449,7 +449,9 @@
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
    <Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
    <Compile Include="Controllers\SCGL\æ¥è®¡åç®¡ç\JIT_DayPlanPlatFormBill_TKController.cs" />
    <Compile Include="Controllers\SCGL\æ¥è®¡åç®¡ç\Xs_SendGoodsPlanBillController.cs" />
    <Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
    <Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />

 WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
@@ -19,6 +19,11 @@
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<<<<<<< HEAD
    <ProjectView>ShowAllFiles</ProjectView>
=======
    <ProjectView>ProjectFiles</ProjectView>
>>>>>>> efb3e796ce184fdd3bfab9c8aab238cec0b20d67
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

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

Binary files differ

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

@@ -4,3 +4,17 @@
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
<<<<<<< HEAD
=======
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
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
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
>>>>>>> f4774e963a8375f13d87e8ad605362cc113aee83

New file
			@@ -0,0 +1,6 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<ProjectView>ProjectFiles</ProjectView>
			</PropertyGroup>
			</Project>

			@@ -79,6 +79,8 @@
			",HLeaveLife=" + omodel.HLeaveLife.ToString() +
			",HProdQty=" + omodel.HProdQty.ToString() +
			",HProdWeight=" + omodel.HProdWeight.ToString() +
			",HNextMainDate='" + omodel.HNextMainDate + "'" +

			" where HInterID=" + lngBillKey.ToString());
			//å é¤å³è
			DeleteRelation(ref sReturn, lngBillKey);
			@@ -151,7 +153,7 @@
			",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
			",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
			",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight" +
			",HUseLife,HLeaveLife,HProdQty,HProdWeight,HNextMainDate" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
			@@ -161,7 +163,7 @@
			",'" + omodel.HOutComDate + "','" + omodel.HOutComNo + "'," + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HSupNumber + "'" +
			"," + omodel.HPrintQty.ToString() + ",'" + omodel.HMouldStatus + "'," + omodel.HWhID.ToString() + "," + omodel.HRoutingID.ToString() +
			"," + omodel.HBomID.ToString() + ",'" + omodel.HVersion + "'," + omodel.HSPGroupID.ToString() + "," + omodel.HSPID.ToString() + "," + omodel.HDesignLife.ToString() +
			"," + omodel.HUseLife.ToString() + "," + omodel.HLeaveLife.ToString() + "," + omodel.HProdQty.ToString() + "," + omodel.HProdWeight.ToString() +
			"," + omodel.HUseLife.ToString() + "," + omodel.HLeaveLife.ToString() + "," + omodel.HProdQty.ToString() + "," + omodel.HProdWeight.ToString() + "," + omodel.HNextMainDate.ToString() +
			") ");
			//
			//æå¥åè¡¨

			@@ -79,7 +79,7 @@
			{
			string subSql = "insert into Gy_MaterPreventErrMouldBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
			" values(" +
			"" + omodel.HInterID.ToString() +
			"," + oSub.HEntryID.ToString() +
			@@ -92,6 +92,7 @@
			"','" + oSub.HPreventErrNote +
			"','" + oSub.HLoseMode +
			"','" + oSub.HLoseCheck +
			"','" + oSub.HPreventErrResult +
			"')";
			oCn.RunProc(subSql);
			}
			@@ -189,7 +190,7 @@
			{
			string subSql = "insert into Gy_MaterPreventErrMouldBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
			" values(" +
			"" + omodel.HInterID.ToString() +
			"," + oSub.HEntryID.ToString() +
			@@ -202,6 +203,7 @@
			"','" + oSub.HPreventErrNote +
			"','" + oSub.HLoseMode +
			"','" + oSub.HLoseCheck +
			"','" + oSub.HPreventErrResult +
			"')";
			oCn.RunProc(subSql);
			}

			@@ -80,7 +80,7 @@
			{
			string subSql = "insert into Qc_PreventErrMouldCheckBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult,HPreventErrResult) " +
			" values(" +
			"" + omodel.HInterID.ToString() +
			"," + oSub.HEntryID.ToString() +
			@@ -94,6 +94,7 @@
			"','" + oSub.HLoseMode +
			"','" + oSub.HLoseCheck +
			"','" + oSub.HCheckResult +
			"','" + oSub.HPreventErrResult +
			"')";
			oCn.RunProc(subSql);
			}
			@@ -195,7 +196,7 @@
			{
			string subSql = "insert into Qc_PreventErrMouldCheckBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HCheckResult,HPreventErrResult) " +
			" values(" +
			"" + omodel.HInterID.ToString() +
			"," + oSub.HEntryID.ToString() +
			@@ -209,6 +210,7 @@
			"','" + oSub.HLoseMode +
			"','" + oSub.HLoseCheck +
			"','" + oSub.HCheckResult +
			"','" + oSub.HPreventErrResult +
			"')";
			oCn.RunProc(subSql);
			}

			@@ -50,5 +50,6 @@
			public string HBarCode;
			public string HInitModel;
			public string HSaveLife;
			public DateTime HNextMainDate;
			}
			}

			@@ -10,6 +10,6 @@
			public string HPreventErrNote; // varchar(200) --é²éåè½
			public string HLoseMode; //varchar(200) --Ê§Ð§Ä£Ê½
			public string HLoseCheck; // varchar(200) --å¤±æéªè¯æ¹æ³

			public string HPreventErrResult; // varchar(200) --é²éç»æ
			}
			}

			@@ -10,6 +10,7 @@
			public string HPreventErrNote; //varchar(200) --é²éåè½
			public string HLoseMode; // varchar(200) --Ê§Ð§Ä£Ê½
			public string HLoseCheck; //varchar(200) --å¤±æéªè¯æ¹æ³
			public string HPreventErrResult; // varchar(200) --é²éç»æ
			public string HCheckResult; //varchar(20) --ç»æï¼OKï¼Xï¼

			}

			@@ -246,6 +246,10 @@
			{
			omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
			{
			omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
			{
			omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -327,6 +331,10 @@
			{
			omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
			{
			omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
			{
			omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -403,6 +411,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
			{
			omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
			{
			@@ -543,6 +555,10 @@
			{
			omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
			{
			omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
			{
			omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -636,6 +652,10 @@
			{
			omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
			{
			omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
			{
			omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -716,6 +736,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
			{
			omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
			{
			@@ -802,6 +826,10 @@
			{
			omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
			{
			omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
			{
			omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -883,6 +911,10 @@
			{
			omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
			{
			omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
			{
			omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -963,6 +995,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
			{
			@@ -1048,6 +1084,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
			{
			omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
			{
			@@ -2576,6 +2616,10 @@
			{
			omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
			{
			omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
			{
			omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2657,6 +2701,10 @@
			{
			omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
			{
			omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
			{
			omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2733,6 +2781,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
			{
			omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
			{
			@@ -2873,6 +2925,10 @@
			{
			omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
			{
			omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
			{
			omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2966,6 +3022,10 @@
			{
			omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
			{
			omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
			{
			omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -3046,6 +3106,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
			{
			omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
			{
			@@ -3132,6 +3196,10 @@
			{
			omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
			{
			omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
			{
			omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -3213,6 +3281,10 @@
			{
			omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
			{
			omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
			{
			omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -3293,6 +3365,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
			{
			@@ -3379,6 +3455,10 @@
			{
			omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
			{
			omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
			{
			omodel.Kf_MoveStockBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);

			@@ -56,6 +56,7 @@
			public string Kf_POStockInBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_POStockInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_POStockInBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_POStockInBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_POStockInBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//äº§åå¥åº
			@@ -79,6 +80,7 @@
			public string Kf_ProductInBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_ProductInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_ProductInBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_ProductInBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_ProductInBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//å¶ä»å¥åº
			@@ -101,6 +103,7 @@
			public string Kf_OtherInBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_OtherInBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_OtherInBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_OtherInBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_OtherInBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//å§å¤å¥åº
			@@ -142,6 +145,7 @@
			public string Kf_MateOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_MateOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_MateOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_MateOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_MateOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//éå®åºåº
			@@ -168,6 +172,7 @@
			public string Kf_SellOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_SellOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_SellOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_SellOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_SellOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//å¶ä»åºåº
			@@ -191,6 +196,7 @@
			public string Kf_OtherOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_OtherOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_OtherOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_OtherOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_OtherOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//å§å¤åºåº
			@@ -215,6 +221,7 @@
			public string Kf_EntrustOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_EntrustOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_EntrustOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_EntrustOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_EntrustOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//çäº§è¡¥æ
			@@ -238,6 +245,7 @@
			public string Kf_MateReplenishOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_MateReplenishOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_MateReplenishOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_MateReplenishOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_MateReplenishOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//å§å¤è¡¥æ
			@@ -261,6 +269,7 @@
			public string Kf_EntrustReplenishOutBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_EntrustReplenishOutBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_EntrustReplenishOutBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_EntrustReplenishOutBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//ç´æ¥è°æ¨
			@@ -285,6 +294,7 @@
			public string Kf_MoveStockBillCheck_WHSPCtl; //æ ¡éª-æ¯å¦æ ¡å¯¹ä»åºä»ä½
			public string Kf_MoveStockBillCheck_MultilineCtl; //æ ¡éª-å¤è¡ç¸åç©æèªå¨æåæ¢è¡å¹é
			public string Kf_MoveStockBillCheck_SourceBarCodeCtl; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			public string Kf_MoveStockBillCheck_AutoBarCode; //åæ«ç æ¨¡å¼
			public string Kf_MoveStockBillCheck_ERPMode; //WMSç³»ç»åæ¥è³ERPçç±»åï¼WISEãCLOUDãMESï¼

			//åæ¥å¼è°åºå

			@@ -4,3 +4,16 @@
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
			<<<<<<< HEAD
			=======
			D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
			D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
			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
			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
			>>>>>>> f4774e963a8375f13d87e8ad605362cc113aee83

			@@ -2665,6 +2665,7 @@
			int HNowSPID = mainList[0].HNowSPID;
			string HMouldUseStatus = mainList[0].HMouldUseStatus;
			int HUSEORGID = mainList[0].HUSEORGID;
			DateTime HNextMainDate = mainList[0].HNextMainDate;
			//è¥MAINDIéå¤åéæ°è·å
			oCN.BeginTran();

			@@ -2745,6 +2746,7 @@
			",HNowWHID=" + HNowWHID +
			",HNowSPID=" + HNowSPID +
			",HInitLife='" + HInitLife +
			",HNextMainDate='" + HNextMainDate +
			"',HMouldUseStatus='" + HMouldUseStatus +
			"' where HInterID=" + HInterID.ToString());

			@@ -1039,6 +1039,9 @@
			if (!tb2.Columns.Contains("å¤±æéªè¯æ¹æ³"))
			error += "æ²¡ææ¾å°ãå¤±æéªè¯æ¹æ³ãçæ é¢,";

			if (!tb2.Columns.Contains("é²éç»æ"))
			error += "æ²¡ææ¾å°ãé²éç»æãçæ é¢,";

			if (!tb2.Columns.Contains("è¡¨ä½å¤æ³¨"))
			error += "æ²¡ææ¾å°ãè¡¨ä½å¤æ³¨ãçæ é¢,";

			@@ -1267,6 +1270,7 @@
			string HPreventErrNote = item["é²éåè½"].ToString();
			string HLoseMode = item["å¤±ææ¨¡å¼"].ToString();
			string HLoseCheck = item["å¤±æéªè¯æ¹æ³"].ToString();
			string HPreventErrResult = item["é²éç»æ"].ToString();

			ds = oCN.RunProcReturn("select * from Gy_MaterPreventErrMouldBillMain where HBillNo='" + HBillNo + "'", "Gy_MaterPreventErrMouldBillMain");

			@@ -1294,7 +1298,7 @@
			//æå¥åè¡¨
			oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
			" values(" +
			"" + HInterID.ToString() +
			"," + 1 +
			@@ -1307,6 +1311,7 @@
			"','" + HPreventErrNote +
			"','" + HLoseMode +
			"','" + HLoseCheck +
			"','" + HPreventErrResult +
			"')");
			}
			else
			@@ -1322,7 +1327,7 @@
			//æå¥åè¡¨
			oCN.RunProc("insert into Gy_MaterPreventErrMouldBillSub " +
			"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck) " +
			",HPreventErrMouldID,HPreventErrNote,HLoseMode,HLoseCheck,HPreventErrResult) " +
			" values(" +
			"" + HInterID.ToString() +
			"," + HEntryID +
			@@ -1335,6 +1340,7 @@
			"','" + HPreventErrNote +
			"','" + HLoseMode +
			"','" + HLoseCheck +
			"','" + HPreventErrResult +
			"')");
			}

			@@ -165,7 +165,7 @@
			return objJsonResult;
			}

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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -261,8 +261,8 @@

			}
			UserName = oItem.HMaker; //å¶åäºº
			oItem.HBillType = "3744";
			oItem.HBillSubType = "3744";
			oItem.HBillType = "7517";
			oItem.HBillSubType = "7517";

			@@ -4188,5 +4188,36 @@
			}
			}
			#endregion

			#region æ´æ°app
			/// <summary>
			///åæ°ï¼string HInterIDã
			///è¿åå¼ï¼objectã
			/// </summary>
			[Route("LMES/AppUpdate")]
			[HttpGet]
			public object AppUpdate(string Type)
			{
			try
			{
			DataSet ds;
			ds = oCN.RunProcReturn("exec h_p_Gy_APPUpdateInformation " + Type , "h_p_Gy_APPUpdateInformation");

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

			@@ -221,6 +221,7 @@
			oItem.HBillType = "3845";
			oItem.HBillSubType = "3845";
			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"));
			oItem.HMaker = user;
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")

			@@ -442,7 +442,7 @@
			BillOld.MvarItemKey = "Sc_MouldUpperBillMain";
			//å é¤åæ§å¶=========================================
			DataSet ds2;
			string sql1 = "exec h_p_Sc_MouldUpperBill_BeforeDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			string sql1 = "exec h_p_Sc_MouldUpperBill_BeforeDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			ds2 = oCN.RunProcReturn(sql1, "h_p_Sc_MouldUpperBill_BeforeDelCtrl");
			if (ds2 == null \|\| ds2.Tables.Count == 0 \|\| ds2.Tables[0].Rows.Count == 0)
			{
			@@ -470,7 +470,7 @@
			oCN.RunProc("delete from Sc_MouldUpperBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);

			//å é¤åæ§å¶=========================================
			string sql2 = "exec h_p_Sc_MouldUpperBill_AfterDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			string sql2 = "exec h_p_Sc_MouldUpperBill_AfterDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			ds2 = oCN.RunProcReturn(sql2, "h_p_Sc_MouldUpperBill_AfterDelCtrl");
			if (ds2 == null \|\| ds2.Tables.Count == 0 \|\| ds2.Tables[0].Rows.Count == 0)
			{
			@@ -1432,7 +1432,7 @@
			BillOld.MvarItemKey = "Sc_MouldLowerBillMain";
			//å é¤åæ§å¶=========================================
			DataSet ds2;
			string sql1 = "exec h_p_Sc_MouldLowerBill_BeforeDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			string sql1 = "exec h_p_Sc_MouldLowerBill_BeforeDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			ds2 = oCN.RunProcReturn(sql1, "h_p_Sc_MouldLowerBill_BeforeDelCtrl");
			if (ds2 == null \|\| ds2.Tables.Count == 0 \|\| ds2.Tables[0].Rows.Count == 0)
			{
			@@ -1461,7 +1461,7 @@
			oCN.RunProc("delete from Sc_MouldLowerBillSub where HInterID=" + hmainid + " and HEntryID=" + hsubid);

			//å é¤åæ§å¶=========================================
			string sql2 = "exec h_p_Sc_MouldLowerBill_AfterDelCtrl " + Convert.ToInt32(HInterID) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			string sql2 = "exec h_p_Sc_MouldLowerBill_AfterDelCtrl " + Convert.ToInt32(hmainid) + ",'" + ds.Tables[0].Rows[0]["HBillNo"] + "','" + user + "'";
			ds2 = oCN.RunProcReturn(sql2, "h_p_Sc_MouldLowerBill_AfterDelCtrl");
			if (ds2 == null \|\| ds2.Tables.Count == 0 \|\| ds2.Tables[0].Rows.Count == 0)
			{

			@@ -332,6 +332,14 @@
			}
			oCN.Commit();//ç»æäºå¡
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®ä¸åå¨,æ æ³å é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -339,50 +347,8 @@
			objJsonResult.data = null;
			return objJsonResult;

			//else if (DataType == 2)
			//{
			// var NumData = HInterID.Split(',');

			// //è·åç³»ç»åæ°
			// string sReturn = "";
			// oSystemParameter.ShowBill(ref sReturn);

			// for (int i = 0; i < NumData.Length; i++)
			// {

			// ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");

			// if (ds.Tables[0].Rows.Count > 0)
			// {
			// if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() != "1")
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "å½ååæ®ä¸è½å é¤ï¼";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }

			// oCN.BeginTran();//å¼å¯äºå¡

			// oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData[i]}");

			// oCN.Commit();//ç»æäºå¡
			// }

			// }
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "å é¤æåï¼";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®ä¸åå¨,æ æ³å é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;

			}
			catch (Exception e)
			{

			@@ -19968,7 +19968,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "è·åå¤±è´¥" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "è·åå¤±è´¥,æªè®¾ç½®é»è®¤æ£éªæ¹æ¡";
			objjson.data = null;
			return objjson;
			}

			@@ -323,7 +323,26 @@
			}
			else
			{
			if (BillOld.ShowBill(mainList[0].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;
			}

			bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
			//bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
			}
			//æç¤º
			if (bResult == true)
			@@ -516,7 +535,7 @@
			oBill.MvarItemKey = "QC_WorkSelfCheckBillMain";

			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			@@ -1017,7 +1036,24 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			var s = "";
			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;
			}

			//å¼å§äºç©
			oCN.BeginTran();

			@@ -203,7 +203,6 @@
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-051]Exceptionï¼" + e.Message;

			@@ -5913,6 +5913,7 @@
			string sJXCode = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sAutoBarCode = "N"; //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼

			#region ç³»ç»åæ°è·å
			@@ -5924,6 +5925,11 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			@@ -5932,6 +5938,11 @@
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»å¥åºå
			@@ -5942,6 +5953,11 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			@@ -5950,6 +5966,11 @@
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éå®åºåºå
			@@ -5960,6 +5981,11 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			@@ -5968,6 +5994,11 @@
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤é¢æå
			@@ -5978,6 +6009,11 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			@@ -5986,6 +6022,11 @@
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤è¡¥æå
			@@ -5996,6 +6037,11 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			@@ -6004,6 +6050,11 @@
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			#endregion
			@@ -6018,8 +6069,17 @@
			}
			try
			{
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (sAutoBarCode == "Y")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ«ç©ææ¡ç æ¨¡å¼ï¼æ éæ«æç©ææ¡ç ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ååæ®ä¸ºæ«ç çæï¼æ ¡éªæ¶ä¸çææ¡ç è®°å½ï¼åªå¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
			if (sSourceBarCodeCtl == "Y")
			else if (sSourceBarCodeCtl == "Y")
			{
			WebSoBar = oWebs.get_BillBarCode_Verify(HBillID, HBillNo, HBillType, sJXCode, HQty, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)

			@@ -73,5 +73,6 @@
			public double HInitLife { get; set; }
			public string HMouldUseStatus { get; set; }

			public DateTime HNextMainDate { get; set; }
			}
			}

			@@ -449,7 +449,9 @@
			<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
			<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
			<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
			<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
			<Compile Include="Controllers\SCGL\æ¥è®¡åç®¡ç\JIT_DayPlanPlatFormBill_TKController.cs" />
			<Compile Include="Controllers\SCGL\æ¥è®¡åç®¡ç\Xs_SendGoodsPlanBillController.cs" />
			<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
			<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
			<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />

			@@ -1,7 +1,7 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<LastActiveSolutionConfig>Debug\|x86</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<UseIISExpress>true</UseIISExpress>
			@@ -19,6 +19,11 @@
			<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
			<WebStackScaffolding_LayoutPageFile />
			<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
			<<<<<<< HEAD
			<ProjectView>ShowAllFiles</ProjectView>
			=======
			<ProjectView>ProjectFiles</ProjectView>
			>>>>>>> efb3e796ce184fdd3bfab9c8aab238cec0b20d67
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>

			@@ -4,3 +4,17 @@
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
			D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
			<<<<<<< HEAD
			=======
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
			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
			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
			>>>>>>> f4774e963a8375f13d87e8ad605362cc113aee83