From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
NETERPNoWin/公用/MESMain.Designer.cs | 165 +-
NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 5
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 42
Kanban/Kanban.csproj | 10
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 2
NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/Controllers/Open_PrintTemController.cs | 2
WebAPI/WebAPI.csproj.user | 6
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 2
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
NETERPNoWin/bin/Debug/HXERP.ini | 34
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Controllers/MateOutController.cs | 108 +
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 2
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
Kanban/工位看板/Gy_WLKB.designer.cs | 286 ++++
WebAPI/Models/Gy_MateNumRelation_Sec.cs | 2
NETERPNoWin/公用/MESMain.resx | 88 +
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll | 0
NETERPNoWin/bin/x86/Debug/KanbanInfo.ini | 81 +
NETERPNoWin/bin/x86/Debug/NPOI.dll | 0
WebAPI/Controllers/WebAPIController.cs | 24
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 11
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
WebAPI/Controllers/品质管理/环境检测单/QC_EnvironmentTestDotCheckBillController.cs | 59
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 29
NETERPNoWin/公用/MESMain.cs | 6
DAL/基础资料/公用基础资料/ClsGy_EquipStatus_Ctl.cs | 34
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb | 0
WebAPI/ListModels.cs | 24
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
DAL/DAL.csproj | 1
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
WebAPI/Controllers/基础资料/基础资料/Gy_MateNumRelationController.cs | 4
Model/生产管理/客户标签/ClsSc_CustomerTagInfoSub.cs | 27
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs | 113 +
WebAPI/WebAPI.csproj | 1
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 3
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
WebAPI/Controllers/基础资料/基础资料/Gy_EquipStatusController.cs | 285 ++++
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 11
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
Model/Model.csproj | 2
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
NETERPNoWin/bin/x86/Debug/HXERP_SY.ini | 6
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config | 3
NETERPNoWin/bin/x86/Debug/WarM.dll.config | 5
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 2
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 2
WebAPI/Controllers/生产管理/客户标签/Sc_CustomerTagController.cs | 676 +++++++++++
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
Kanban/工位看板/Gy_WLKB.resx | 156 ++
DAL/生产管理/客户标签/ClsSc_CustomerTagInfo.cs | 370 ++++++
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 89 +
Kanban/工位看板/Gy_WLKB.cs | 581 +++++++++
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
Model/基础资料/基础资料/ClsGy_EquipStatus_Model.cs | 11
NETERPNoWin/NETERPNoWin.csproj.user | 1
NETERPNoWin/NETERPNoWin.csproj | 23
WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs | 65
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll | 0
NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll | 0
Model/生产管理/客户标签/ClsSc_CustomerTagInfoMain.cs | 11
NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
DBUtility/基础资料/ClsGy_Base_Ctl.cs | 12
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
93 files changed, 3,321 insertions(+), 205 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 637e2b0..51bbccf 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -101,6 +101,7 @@
<Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfo.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBill.cs" />
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Ctl.cs"
index 845618e..172bcbd 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Ctl.cs"
@@ -12,11 +12,26 @@
public string HOldNumber;
public Model.ClsGy_EquipStatus_Model oModel = new Model.ClsGy_EquipStatus_Model();
//鏂板
- public override bool AddNew()
+ public override bool AddNew(ref string sReturn)
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_EquipStatus_BeforeSaveCtrl '" + oModel.HNumber + "','" + oModel.HName + "'," + oModel.HUSEORGID + ",1,0 ", "h_p_Gy_EquipStatus_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.BeginTran();
oCn.RunProc($@"insert into Gy_EquipStatus(HNumber,HName ,HShortNumber ,HParentID ,HLevel
,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
@@ -40,10 +55,25 @@
}
//淇敼
- public override bool ModifyByID(Int64 sItemID)
+ public override bool ModifyByID(Int64 sItemID, ref string sReturn)
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_EquipStatus_BeforeSaveCtrl '" + oModel.HNumber + "','" + oModel.HName + "'," + oModel.HUSEORGID + ",3," + sItemID, "h_p_Gy_EquipStatus_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
oCn.BeginTran();
oCn.RunProc("Update " + MvarItemKey + " set " +
" HNumber='" + oModel.HNumber + "'" +
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfo.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfo.cs"
new file mode 100644
index 0000000..7b717bd
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfo.cs"
@@ -0,0 +1,370 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSc_CustomerTagInfo : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_CustomerTagInfoMain omodel = new Model.ClsSc_CustomerTagInfoMain();
+ public List<Model.ClsSc_CustomerTagInfoSub> DetailColl = new List<Model.ClsSc_CustomerTagInfoSub>();
+
+ public ClsSc_CustomerTagInfo()
+ {
+ base.MvarItemKeySub = "Sc_CustomerTagInfoSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sc_CustomerTagInfoMain";
+ base.MvarReportTitle = "瀹㈡埛鏍囩淇℃伅";
+ base.BillType = "10003";
+ base.HBillSubType = "10003";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_CustomerTagInfo()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //鍒犻櫎鍏宠仈
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_CustomerTagInfo_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_CustomerTagInfo_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ //
+ oCn.BeginTran();
+
+ string mainSql = "update Sc_CustomerTagInfoMain set " +
+ "HDate = '" + omodel.HDate + "'" +
+ ",HRemark = '" + omodel.HRemark + "'" +
+ ",HUpDater = '" + omodel.HUpDater + "'" +
+ ",HUpDateDate = " + "getdate()" + "" +
+ " where HInterID = " + lngBillKey;
+ //鏇存柊涓昏〃
+ oCn.RunProc(mainSql);
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_CustomerTagInfoSub oSub in DetailColl)
+ {
+ string subSql = "Insert into Sc_CustomerTagInfoSub" +
+ " (HInterID,HEntryID,HRemark,HBillNo_bak,HMaterID,HCustID,HEPE,HPU,HSKU" +
+ ",HSIZE1,HSIZE2,HLBS,HOZ,HUPC,HSKU2,HFABRIC,HSN,HSize,HCustMaterNumber,HCustMaterName,HCustMaterModel" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ") values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID +
+ ",'" + oSub.HRemark + "'" +
+ ",'" + oSub.HBillNo_bak + "'" +
+ "," + oSub.HMaterID +
+ "," + oSub.HCustID +
+ ",'" + oSub.HEPE + "'" +
+ ",'" + oSub.HPU + "'" +
+ ",'" + oSub.HSKU + "'" +
+ ",'" + oSub.HSIZE1 + "'" +
+ ",'" + oSub.HSIZE2 + "'" +
+ ",'" + oSub.HLBS + "'" +
+ ",'" + oSub.HOZ + "'" +
+ ",'" + oSub.HUPC + "'" +
+ ",'" + oSub.HSKU2 + "'" +
+ ",'" + oSub.HFABRIC + "'" +
+ ",'" + oSub.HSN + "'" +
+ ",'" + oSub.HSize + "'" +
+ ",'" + oSub.HCustMaterNumber + "'" +
+ ",'" + oSub.HCustMaterName + "'" +
+ ",'" + oSub.HCustMaterModel + "'" +
+ "," + oSub.HSourceInterID.ToString() + "" +
+ "," + oSub.HSourceEntryID.ToString() + "" +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ ") ";
+
+ oCn.RunProc(subSql);
+ }
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_CustomerTagInfo_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_CustomerTagInfo_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+
+ //
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_CustomerTagInfo_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_CustomerTagInfo_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ string mainSql = "Insert Into Sc_CustomerTagInfoMain" +
+ "(HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HBillStatus" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ") " +
+ "values(" +
+ "" + omodel.HInterID.ToString() + "" +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ "," + omodel.HYear.ToString() + "" +
+ "," + omodel.HPeriod.ToString() + "" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HMaker + "'" +
+ "," + "getdate()" + "" +
+ "," + "1" + "" +
+ "," + omodel.HMainSourceInterID + "" +
+ "," + omodel.HMainSourceEntryID + "" +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ ") ";
+
+ oCn.RunProc(mainSql);
+
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_CustomerTagInfoSub oSub in DetailColl)
+ {
+ string subSql = "Insert into Sc_CustomerTagInfoSub" +
+ " (HInterID,HEntryID,HRemark,HBillNo_bak,HMaterID,HCustID,HEPE,HPU,HSKU" +
+ ",HSIZE1,HSIZE2,HLBS,HOZ,HUPC,HSKU2,HFABRIC,HSN,HSize,HCustMaterNumber,HCustMaterName,HCustMaterModel" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ") values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID +
+ ",'" + oSub.HRemark + "'" +
+ ",'" + oSub.HBillNo_bak + "'" +
+ "," + oSub.HMaterID +
+ "," + oSub.HCustID +
+ ",'" + oSub.HEPE + "'" +
+ ",'" + oSub.HPU + "'" +
+ ",'" + oSub.HSKU + "'" +
+ ",'" + oSub.HSIZE1 + "'" +
+ ",'" + oSub.HSIZE2 + "'" +
+ ",'" + oSub.HLBS + "'" +
+ ",'" + oSub.HOZ + "'" +
+ ",'" + oSub.HUPC + "'" +
+ ",'" + oSub.HSKU2 + "'" +
+ ",'" + oSub.HFABRIC + "'" +
+ ",'" + oSub.HSN + "'" +
+ ",'" + oSub.HSize + "'" +
+ ",'" + oSub.HCustMaterNumber + "'" +
+ ",'" + oSub.HCustMaterName + "'" +
+ ",'" + oSub.HCustMaterModel + "'" +
+ "," + oSub.HSourceInterID.ToString() + "" +
+ "," + oSub.HSourceEntryID.ToString() + "" +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ ") ";
+
+ oCn.RunProc(subSql);
+ }
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+
+ //
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_CustomerTagInfo_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_CustomerTagInfo_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Sc_CustomerTagInfoMain Where HInterID=" + lngBillKey.ToString(), "Sc_CustomerTagInfoMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Sc_CustomerTagInfoSub Where HInterID=" + lngBillKey.ToString(), "Sc_CustomerTagInfoSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_CustomerTagInfoSub oSub = new Model.ClsSc_CustomerTagInfoSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ }
+}
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
index 2f41816..41b1b7f 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
@@ -16,12 +16,24 @@
return true;
}
+ //鏂板鍩虹璧勬枡
+ public virtual bool AddNew(ref string sReturn)
+ {
+ return true;
+ }
+
//淇敼
public virtual bool ModifyByID(Int64 sItemID)
{
return true;
}
+ //淇敼(杩斿洖寮傚父淇℃伅)
+ public virtual bool ModifyByID(Int64 sItemID, ref string sReturn)
+ {
+ return true;
+ }
+
#region 鍥哄畾浠ｇ爜
//鏄惁瀛樺湪瀛愰」鐩�
public bool HavChildCodes(Int64 sItemID)
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index d8b7bf8..4d4704a 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -134,6 +134,12 @@
<Compile Include="Sc_WorkshopKB.designer.cs">
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
</Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Gy_WLKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Gy_WLKB.designer.cs">
+ <DependentUpon>Gy_WLKB.cs</DependentUpon>
+ </Compile>
<Compile Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.cs">
<SubType>Form</SubType>
</Compile>
@@ -374,6 +380,10 @@
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="宸ヤ綅鐪嬫澘\Gy_WLKB.resx">
+ <DependentUpon>Gy_WLKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.resx">
<DependentUpon>Sc_WGJCKKB.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs"
new file mode 100644
index 0000000..b8a8487
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs"
@@ -0,0 +1,581 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using Pub_Class;
+
+namespace Kanban
+{
+ public partial class Gy_WLKB : Form
+ {
+ public Gy_WLKB()
+ {
+ InitializeComponent();
+ }
+ public DBUtility.frmBillQueryCondition_New frmCondition;
+ public string ViewName = "h_p_Gy_WLKB";
+ public string ModCaption = "鐗╂枡鐪嬫澘";
+ public const string ModName = "3702";
+ public const string ModRightName = "Gy_WLKB";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public string sDeptID = "0";
+ DataSet DSet;
+
+ int FY = 29;
+ //
+ private void initGrid()
+ {
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //鍒楁爣棰�
+ //grdMain.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionBackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //grdMain.ColumnHeadersHeight = 40;
+ //grdMain.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ ////濂囨暟琛�
+ //grdMain.AlternatingRowsDefaultCellStyle.BackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionForeColor = Color.White;
+ ////缃戞牸鑳屾櫙鑹�
+ //grdMain.BackgroundColor = Color.FromArgb(104, 97, 118);
+ ////鍒楁爣棰樿竟妗嗘牱寮�
+ //grdMain.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; ;
+ ////鏍囬鏍峰紡鏄惁浣跨敤鐢ㄦ埛褰撳墠涓婚鐨勬牱寮�
+ //grdMain.EnableHeadersVisualStyles = false;
+ ////闅愯棌琛屾爣棰�
+ //grdMain.RowHeadersVisible = false;
+ ////鍗曞厓鏍�
+ //grdMain.RowsDefaultCellStyle.BackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //--------------------
+ DBUtility.Xt_BaseBillFun.initKanBan(this.Name, grdMain, Tool, toolStripLabel1, null, ref FY, timer2, timer3);
+ }
+ //
+
+ private void Display()
+ {
+ try
+ {
+ //ClsCN SubCn = new ClsCN();
+ //string sSql = "";
+ //string sWhere = "";
+ ////杩囨护鏉′欢
+ ////if (frmCondition.SqlStr.Trim().Length == 0)
+ //// return;
+ ////sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ //sSql = "exec h_p_QLKB ";
+ ////
+ //DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ ////鐢熸垚棣栬鏍囬
+ //if (DSet == null)
+ //{
+ // //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ // return;
+ //}
+ ////閲婃斁鍐荤粨
+ //DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ ////
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
+ ////
+
+ ////-----------棰勮鐘舵��
+ ////寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ ////瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ ////int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ ////int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ ////int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ ////DateTime oNow = DateTime.Today.Date;
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ //// }
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ //// }
+ ////}
+
+ ////璁剧疆鍚堣鍒�
+ //string sTotalCol = "";
+ //sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ //string[] sT;
+ //sT = sTotalCol.Split(Convert.ToChar(","));
+ //oSumGrid.BuildTotalCols(sT);
+ ////
+ ////鍐荤粨
+ //int FrCol = 10;
+ //string s = "鏄�";
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ ////鐢荤嚎
+ ////GraphLine();
+
+ ////Total();
+
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (i % 2 == 0)
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ ////}
+ ////
+ ///
+ //ClsCN clsCN = new ClsCN();
+ //ClsIni clsIni = new ClsIni();
+ //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
+ //this.sDeptID = text;
+ string s = "";
+
+ ClsCN SubCn = new ClsCN();
+ string sSql = "";
+ string sWhere = "";
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Warehouse", "HWhID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ sDeptID = sID;
+ string procName = "exec h_p_Gy_WLKB " + this.sDeptID;
+ this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ bool flag = this.DSet == null;
+ if (!flag)
+ {
+ Xt_BaseBillFun.CancelFrozenCol(this.grdMain);
+ this.grdMain.DataSource = this.DSet.Tables[0].DefaultView;
+ string totalCols = Gy_BaseFun.GetTotalCols(this.DSet);
+ string[] cols = totalCols.Split(new char[]
+ {
+ Convert.ToChar(",")
+ });
+ this.oSumGrid.BuildTotalCols(cols);
+ int frCol = 10;
+ s = "鍚�";
+ Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
+ }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+ //s = "鍚�";
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //long n = 0;
+ //DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+ //Total();
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+ }
+ //
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ initGrid();
+ Display();
+ }
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ private void dj_Click(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+
+ }
+ //
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+ //
+ private void Gy_WLKB_Load(object sender, EventArgs e)
+ {
+ //
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //lblCaption.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sID == "娌℃湁鎵惧埌锛�")
+ {
+ sDeptID = "0";
+ }
+ else
+ {
+ sDeptID = sID;
+ }
+ }
+
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ //Sc_WorkBillProcReportKB o = new Sc_WorkBillProcReportKB();
+ //if(grdMain.CurrentRow==null)
+ // return;
+ //o.sICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
+ //o.sDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HDeptID")].Value);
+ //o.ShowDialog();
+ }
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
+
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //
+ }
+
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+ //鍒犻櫎
+ private void Sub_DeleteBill()
+ {
+
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //timer2.Enabled = false;
+ //frmCondition = new frmBillQueryCondition_New();
+ //SetCondition(frmCondition, ViewName, this.Name);
+ //frmCondition.ShowDialog();
+ //if (frmCondition.Tag.ToString() == "OK")
+ //{
+ //timer1.Enabled = true;
+ //}
+
+ if (DSet != null && DSet.Tables[0].Rows.Count > FY)
+ {
+ for (int y = 0; y < FY; y++)
+ {
+ DataRow newRow = DSet.Tables[0].NewRow();
+ //鐢ㄧ浉搴斿�煎～鍐欐暟鎹
+ for (int m = 0; m < DSet.Tables[0].Columns.Count; m++)
+ {
+ newRow[m] = DSet.Tables[0].Rows[0][m];
+ }
+ //濉啓瀹屾瘯锛屽皢鏁版嵁琛屾坊鍔犲埌鏁版嵁闆�
+ DSet.Tables[0].Rows.Add(newRow);
+
+ DSet.Tables[0].Rows.Remove(DSet.Tables[0].Rows[0]);
+ }
+
+ grdMain.DataSource = null;
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+
+
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //string s = "鍚�";
+ //long n = 0;
+ //DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+
+
+
+
+ ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
+ //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
+ //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 0)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Red;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) < 7)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Orange;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) >= 7 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 14)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Yellow;
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.ForeColor = Color.Black;
+ // }
+ // //================= //------------鏈笅鍗� 澶т簬0 鏄剧ず绾㈣壊
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HSumUnDownQtyCol].Value) > 0)
+ // {
+ // grdMain.Rows[i].Cells[HSumUnDownQtyCol].Style.BackColor = Color.Red;
+ // }
+ //}
+
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, "", 0);
+ }
+ }
+
+
+
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+ //
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ //鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+ //瀹℃牳
+ private void sh_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+
+ }
+ //鍙嶅鏍�
+ private void qsh_Click(object sender, EventArgs e)
+ {
+ Sub_AbandonCheck();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(true);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("HMaterID"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!锛�" + e.Message);
+ }
+ }
+
+ #endregion
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount>0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+ //寮曞嚭EXCEL
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+ int HQty = 0;
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ if (HQty < 10)
+ {
+ HQty = HQty + 1;
+ }
+ else
+ {
+ HQty = 0;
+ timer1.Enabled = true;
+ }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ if (toolStripButton1.Text == "鏆傚仠")
+ {
+ toolStripButton1.Text = "杩愯";
+ timer2.Enabled = false;
+ }
+ else
+ {
+ toolStripButton1.Text = "鏆傚仠";
+ timer2.Enabled = true;
+ }
+ }
+
+ private void txtHMaterID_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ //Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ //oSZ.HName = this.Name;
+ //oSZ.ShowDialog();
+ timer1.Enabled = true;
+
+
+ Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ oSZ.HName = this.Name;
+ oSZ.ShowDialog();
+ timer1.Enabled = true;
+ }
+
+ private void grdMain_Sorted(object sender, EventArgs e)
+ {
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ DateTime oNow = DateTime.Today.Date;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ }
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs"
new file mode 100644
index 0000000..2d98fbe
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs"
@@ -0,0 +1,286 @@
+锘縩amespace Kanban
+{
+ partial class Gy_WLKB
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_WLKB));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackColor = System.Drawing.Color.Black;
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tc,
+ this.toolStripButton1,
+ this.toolStripButton2,
+ this.toolStripSeparator3,
+ this.toolStripSeparator9,
+ this.toolStripSeparator7,
+ this.toolStripLabel1});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(906, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tc.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.tc.ForeColor = System.Drawing.Color.White;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(50, 47);
+ this.tc.Text = "<杩斿洖";
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.AutoSize = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton1.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(50, 47);
+ this.toolStripButton1.Text = "鏆傚仠";
+ this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.AutoSize = false;
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton2.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(36, 47);
+ this.toolStripButton2.Text = "璁剧疆";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.toolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripLabel1.Font = new System.Drawing.Font("Microsoft YaHei UI", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripLabel1.ForeColor = System.Drawing.Color.White;
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(92, 47);
+ this.toolStripLabel1.Text = "鐗╂枡鐪嬫澘";
+ this.toolStripLabel1.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 20000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 8;
+ this.grdPrint.Visible = false;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(906, 19);
+ this.grdSum.TabIndex = 47;
+ this.grdSum.Visible = false;
+ //
+ // timer3
+ //
+ this.timer3.Enabled = true;
+ this.timer3.Interval = 1800000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.BackgroundColor = System.Drawing.Color.Black;
+ this.grdMain.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.ColumnHeadersHeight = 40;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.EnableHeadersVisualStyles = false;
+ this.grdMain.Location = new System.Drawing.Point(0, 50);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.CornflowerBlue;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.grdMain.RowHeadersVisible = false;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.grdMain.Size = new System.Drawing.Size(906, 462);
+ this.grdMain.TabIndex = 48;
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Sorted += new System.EventHandler(this.grdMain_Sorted);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
+ //
+ // Gy_WLKB
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(906, 531);
+ this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "Gy_WLKB";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鍗曟嵁鍒楄〃";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Gy_WLKB_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.DataGridView grdMain;
+ }
+}
\ No newline at end of file
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx"
new file mode 100644
index 0000000..de4031c
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx"
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>191, 16</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>281, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/Model/Model.csproj b/Model/Model.csproj
index d3319e1..e5bc186 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -162,6 +162,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EnvironmentTestItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Model.cs"
index e9ef4fd..a5d186f 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EquipStatus_Model.cs"
@@ -6,15 +6,6 @@
{
public class ClsGy_EquipStatus_Model : DBUtility.ClsGy_Base_Model
{
- public DateTime HMakeTime { get; set; }
- public DateTime HCheckTime { get; set; }
- public DateTime HModifyTime { get; set; }
- public DateTime HStopTime { get; set; }
- public string HMakeEmp { get; set; }
- public string HCheckEmp { get; set; }
- public string HModifyEmp { get; set; }
- public string HStopEmp { get; set; }
- public int HUSEORGID { get; set; }
- public int HCREATEORGID { get; set; }
+
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoMain.cs"
new file mode 100644
index 0000000..2d8aef1
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoMain.cs"
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_CustomerTagInfoMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoSub.cs"
new file mode 100644
index 0000000..7be545a
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/ClsSc_CustomerTagInfoSub.cs"
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_CustomerTagInfoSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID ;
+ public Int64 HCustID ;
+ public string HEPE ;
+ public string HPU ;
+ public string HSKU ;
+ public string HSIZE1 ;
+ public string HSIZE2 ;
+ public string HLBS ;
+ public string HOZ ;
+ public string HUPC ;
+ public string HSKU2 ;
+ public string HFABRIC ;
+ public string HSN ;
+ public string HSize ;
+ public string HCustMaterNumber ;
+ public string HCustMaterName ;
+ public string HCustMaterModel ;
+ }
+}
diff --git a/NETERPNoWin/NETERPNoWin.csproj b/NETERPNoWin/NETERPNoWin.csproj
index e5ced92..85c4fab 100644
--- a/NETERPNoWin/NETERPNoWin.csproj
+++ b/NETERPNoWin/NETERPNoWin.csproj
@@ -15,9 +15,23 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <ApplicationRevision>0</ApplicationRevision>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -235,6 +249,13 @@
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/NETERPNoWin/NETERPNoWin.csproj.user b/NETERPNoWin/NETERPNoWin.csproj.user
index 0167e32..48918e7 100644
--- a/NETERPNoWin/NETERPNoWin.csproj.user
+++ b/NETERPNoWin/NETERPNoWin.csproj.user
@@ -11,5 +11,6 @@
</BootstrapperUrlHistory>
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>true</VerifyUploadedFiles>
+ <ErrorReportUrlHistory />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/NETERPNoWin/bin/Debug/HXERP.ini b/NETERPNoWin/bin/Debug/HXERP.ini
index b4a02fe..b6ac63e 100644
--- a/NETERPNoWin/bin/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/Debug/HXERP.ini
@@ -1,32 +1,38 @@
[po]
-Server=192.168.80.173
+Server=47.96.97.237,15127
[Erp]
-Server=192.168.80.173
-DataBase=HX_APSsys
-DataBaseNumber=
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
-[ErpZL]
-Server=192.168.80.173
-DataBase=HX_APSsys
-DataBaseNumber=
+[Srm]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
-Server=192.168.80.173
-DataBase=AIS20090410141516
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
-Server=192.168.80.173
-DataBase=AIS20090410141516
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
-UserName=admin
-UserPsd=jinghuanzh
+UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
+UserPsd=1
Remember=1
+[CLOUDINFO]
+
+sCLOUDUrl=http://47.96.97.237/k3cloud/
+sCLOUDAcc=6204a70eba35fc
+sCLOUDUseName=demo
+sCLOUDPsd=888888
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
new file mode 100644
index 0000000..fbd0ebf
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..f33f9ae
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
new file mode 100644
index 0000000..2746749
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
new file mode 100644
index 0000000..c4412c2
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
new file mode 100644
index 0000000..fd9f98b
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
new file mode 100644
index 0000000..3bd248d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
new file mode 100644
index 0000000..8e7d408
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
new file mode 100644
index 0000000..6d45edb
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
new file mode 100644
index 0000000..bd1fbdb
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
new file mode 100644
index 0000000..ef476d0
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
index 98e9b54..7e96675 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
@@ -29,7 +29,7 @@
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=车间看板
+gnmc=物料看板
[Warehouse]
-HWhID=0
-HWhName=
+HWhID=101259
+HWhName=平板成品仓
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..a7d1d4f
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
new file mode 100644
index 0000000..5008549
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
new file mode 100644
index 0000000..4044658
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
index b79b725..8d9b65c 100644
--- a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
+++ b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
@@ -223,6 +223,33 @@
Title-BackColor=
Title-PageRows=
Title-PageDownTimer=
+Title-DisplayTimer=1
+Header-ForeColor=
+Header-FontFamily=
+Header-FontSize=
+Header-FontStyle=
+Header-BackColor=
+Header-Alignment=
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
+[Sc_WGJCKKB]
+Title-Caption=
+Title-ForeColor=
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=
+Title-PageDownTimer=
Title-DisplayTimer=
Header-ForeColor=
Header-FontFamily=
@@ -241,3 +268,57 @@
Cell-RowHeight=
Cell-AlternatingBackColor=
Cell-DefaultBackColor=
+[Gy_WLKB]
+Title-Caption=物料看板
+Title-ForeColor=Lime
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=10
+Title-PageDownTimer=5
+Title-DisplayTimer=1
+Header-ForeColor=#FF0080
+Header-FontFamily=[FontFamily: Name=宋体]
+Header-FontSize=9
+Header-FontStyle=Regular
+Header-BackColor=Black
+Header-Alignment=居中
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=White
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=Black
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
+[Sc_CGKB]
+Title-Caption=
+Title-ForeColor=
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=
+Title-PageDownTimer=
+Title-DisplayTimer=1
+Header-ForeColor=
+Header-FontFamily=
+Header-FontSize=
+Header-FontStyle=
+Header-BackColor=
+Header-Alignment=
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
diff --git a/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll b/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
new file mode 100644
index 0000000..25dd347
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll
new file mode 100644
index 0000000..154580d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb
new file mode 100644
index 0000000..5eedfea
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
new file mode 100644
index 0000000..b5b0f81
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
new file mode 100644
index 0000000..4c44891
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
new file mode 100644
index 0000000..a11b2c4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
new file mode 100644
index 0000000..51278a4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
new file mode 100644
index 0000000..67b1977
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
new file mode 100644
index 0000000..a200471
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
new file mode 100644
index 0000000..5034194
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
new file mode 100644
index 0000000..df8708d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.dll b/NETERPNoWin/bin/x86/Debug/NPOI.dll
new file mode 100644
index 0000000..907cfb1
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll b/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
new file mode 100644
index 0000000..341d08f
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
new file mode 100644
index 0000000..d4c7724
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
new file mode 100644
index 0000000..41606dc
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
new file mode 100644
index 0000000..e89d7c5
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
new file mode 100644
index 0000000..4fe3580
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
new file mode 100644
index 0000000..551ad4d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
new file mode 100644
index 0000000..06a4d34
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
new file mode 100644
index 0000000..28e5cac
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
new file mode 100644
index 0000000..56424f0
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
new file mode 100644
index 0000000..81be5c4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
new file mode 100644
index 0000000..5120a5f
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
new file mode 100644
index 0000000..5038c94
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll.config b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
new file mode 100644
index 0000000..d9658be
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <configSections>
+ </configSections>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
new file mode 100644
index 0000000..50420b0
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
new file mode 100644
index 0000000..6eee90e
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
new file mode 100644
index 0000000..b5b7c01
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
index 8258182..383723f 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -54,7 +54,8 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=
frmDownMenu任务单设置=100,135,100
-Sc_CJKB=
+Sc_CJKB=100,100,100,100,100,100
Sc_CGKB=100,100,100,100,100,100,100,100,100,100,100
Sc_QLKB=100,100,100,100,100,100,100,100,100,100,100
Sc_WGJCKKB=
+Gy_WLKB=100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,10,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index a994c19..3e1c065 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -272,3 +272,5 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
index 0453b8c..573e878 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
@@ -57,16 +57,17 @@
this.Sc_WorkBillProcTestReportKB = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.Sc_WGJCKKB = new System.Windows.Forms.Button();
+ this.Gy_WLKB = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// Sc_ICMOBillList_K3
//
this.Sc_ICMOBillList_K3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ICMOBillList_K3.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ICMOBillList_K3.Image")));
- this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(202, 24);
- this.Sc_ICMOBillList_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(135, 16);
this.Sc_ICMOBillList_K3.Name = "Sc_ICMOBillList_K3";
- this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(110, 110);
+ this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(73, 73);
this.Sc_ICMOBillList_K3.TabIndex = 1;
this.Sc_ICMOBillList_K3.Tag = "閲囪喘鐪嬫澘";
this.Sc_ICMOBillList_K3.UseVisualStyleBackColor = true;
@@ -76,10 +77,9 @@
//
this.Sc_MESBeginWorkBill_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_MESBeginWorkBill_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_MESBeginWorkBill_Fast.Image")));
- this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(698, 189);
- this.Sc_MESBeginWorkBill_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(465, 126);
this.Sc_MESBeginWorkBill_Fast.Name = "Sc_MESBeginWorkBill_Fast";
- this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(110, 110);
+ this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(73, 73);
this.Sc_MESBeginWorkBill_Fast.TabIndex = 7;
this.Sc_MESBeginWorkBill_Fast.Tag = "寮�宸ュ崟";
this.Sc_MESBeginWorkBill_Fast.UseVisualStyleBackColor = true;
@@ -89,10 +89,9 @@
//
this.Sc_ProcExchReport_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ProcExchReport_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ProcExchReport_Fast.Image")));
- this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(949, 189);
- this.Sc_ProcExchReport_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(633, 126);
this.Sc_ProcExchReport_Fast.Name = "Sc_ProcExchReport_Fast";
- this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(110, 110);
+ this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(73, 73);
this.Sc_ProcExchReport_Fast.TabIndex = 8;
this.Sc_ProcExchReport_Fast.Tag = "浜ч噺姹囨姤鍗�";
this.Sc_ProcExchReport_Fast.UseVisualStyleBackColor = true;
@@ -102,10 +101,9 @@
//
this.Sc_WorkBillPlanReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanReportKB.Image")));
- this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(452, 24);
- this.Sc_WorkBillPlanReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(301, 16);
this.Sc_WorkBillPlanReportKB.Name = "Sc_WorkBillPlanReportKB";
- this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillPlanReportKB.TabIndex = 2;
this.Sc_WorkBillPlanReportKB.Tag = "杞﹂棿鐪嬫澘";
this.Sc_WorkBillPlanReportKB.UseVisualStyleBackColor = true;
@@ -115,10 +113,9 @@
//
this.Sc_WorkBillPlanSumReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanSumReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanSumReportKB.Image")));
- this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(698, 24);
- this.Sc_WorkBillPlanSumReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(465, 16);
this.Sc_WorkBillPlanSumReportKB.Name = "Sc_WorkBillPlanSumReportKB";
- this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillPlanSumReportKB.TabIndex = 3;
this.Sc_WorkBillPlanSumReportKB.Tag = "缂烘枡鐪嬫澘";
this.Sc_WorkBillPlanSumReportKB.UseVisualStyleBackColor = true;
@@ -136,10 +133,9 @@
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(187, 138);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(125, 92);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(137, 29);
+ this.label1.Size = new System.Drawing.Size(93, 19);
this.label1.TabIndex = 65;
this.label1.Text = "閲囪喘鐪嬫澘";
this.label1.Click += new System.EventHandler(this.label1_Click);
@@ -150,10 +146,9 @@
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(693, 308);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(462, 205);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(106, 29);
+ this.label2.Size = new System.Drawing.Size(72, 19);
this.label2.TabIndex = 66;
this.label2.Text = "寮�宸ュ崟";
//
@@ -163,10 +158,9 @@
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(926, 308);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(617, 205);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(168, 29);
+ this.label3.Size = new System.Drawing.Size(114, 19);
this.label3.TabIndex = 67;
this.label3.Text = "浜ч噺姹囨姤鍗�";
//
@@ -176,10 +170,9 @@
this.label6.BackColor = System.Drawing.Color.Transparent;
this.label6.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(447, 138);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(298, 92);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(137, 29);
+ this.label6.Size = new System.Drawing.Size(93, 19);
this.label6.TabIndex = 70;
this.label6.Text = "杞﹂棿鐪嬫澘";
this.label6.Click += new System.EventHandler(this.label6_Click);
@@ -190,10 +183,9 @@
this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(693, 138);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(462, 92);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(137, 29);
+ this.label7.Size = new System.Drawing.Size(93, 19);
this.label7.TabIndex = 71;
this.label7.Text = "缂烘枡鐪嬫澘";
this.label7.Click += new System.EventHandler(this.label7_Click);
@@ -204,10 +196,9 @@
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(935, 471);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(290, 420);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(137, 29);
+ this.label8.Size = new System.Drawing.Size(93, 19);
this.label8.TabIndex = 73;
this.label8.Text = "绯荤粺璁剧疆";
//
@@ -215,10 +206,9 @@
//
this.cmdSetKanbanIni.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdSetKanbanIni.Image = ((System.Drawing.Image)(resources.GetObject("cmdSetKanbanIni.Image")));
- this.cmdSetKanbanIni.Location = new System.Drawing.Point(951, 357);
- this.cmdSetKanbanIni.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSetKanbanIni.Location = new System.Drawing.Point(302, 344);
this.cmdSetKanbanIni.Name = "cmdSetKanbanIni";
- this.cmdSetKanbanIni.Size = new System.Drawing.Size(110, 110);
+ this.cmdSetKanbanIni.Size = new System.Drawing.Size(73, 73);
this.cmdSetKanbanIni.TabIndex = 11;
this.cmdSetKanbanIni.Tag = "绯荤粺璁剧疆";
this.cmdSetKanbanIni.UseVisualStyleBackColor = true;
@@ -230,10 +220,9 @@
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(175, 308);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(117, 205);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(199, 29);
+ this.label9.Size = new System.Drawing.Size(135, 19);
this.label9.TabIndex = 75;
this.label9.Text = "鏈満缂烘枡鐪嬫澘";
//
@@ -241,10 +230,9 @@
//
this.Sc_BJQLFXB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BJQLFXB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BJQLFXB.Image")));
- this.Sc_BJQLFXB.Location = new System.Drawing.Point(202, 189);
- this.Sc_BJQLFXB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BJQLFXB.Location = new System.Drawing.Point(135, 126);
this.Sc_BJQLFXB.Name = "Sc_BJQLFXB";
- this.Sc_BJQLFXB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_BJQLFXB.Size = new System.Drawing.Size(73, 73);
this.Sc_BJQLFXB.TabIndex = 5;
this.Sc_BJQLFXB.Tag = "鏈満缂烘枡鐪嬫澘";
this.Sc_BJQLFXB.UseVisualStyleBackColor = true;
@@ -256,10 +244,9 @@
this.label10.BackColor = System.Drawing.Color.Transparent;
this.label10.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(410, 308);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(273, 205);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(199, 29);
+ this.label10.Size = new System.Drawing.Size(135, 19);
this.label10.TabIndex = 77;
this.label10.Text = "缂烘枡姹囨�荤湅鏉�";
//
@@ -267,10 +254,9 @@
//
this.Sc_HZQLCGKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_HZQLCGKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_HZQLCGKB.Image")));
- this.Sc_HZQLCGKB.Location = new System.Drawing.Point(452, 189);
- this.Sc_HZQLCGKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_HZQLCGKB.Location = new System.Drawing.Point(301, 126);
this.Sc_HZQLCGKB.Name = "Sc_HZQLCGKB";
- this.Sc_HZQLCGKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_HZQLCGKB.Size = new System.Drawing.Size(73, 73);
this.Sc_HZQLCGKB.TabIndex = 6;
this.Sc_HZQLCGKB.Tag = "缂烘枡姹囨�荤湅鏉�";
this.Sc_HZQLCGKB.UseVisualStyleBackColor = true;
@@ -282,10 +268,9 @@
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(944, 138);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(629, 92);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(137, 29);
+ this.label11.Size = new System.Drawing.Size(93, 19);
this.label11.TabIndex = 79;
this.label11.Text = "鍙戣揣鐪嬫澘";
//
@@ -293,10 +278,9 @@
//
this.Sc_BRFHKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BRFHKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BRFHKB.Image")));
- this.Sc_BRFHKB.Location = new System.Drawing.Point(949, 24);
- this.Sc_BRFHKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BRFHKB.Location = new System.Drawing.Point(633, 16);
this.Sc_BRFHKB.Name = "Sc_BRFHKB";
- this.Sc_BRFHKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_BRFHKB.Size = new System.Drawing.Size(73, 73);
this.Sc_BRFHKB.TabIndex = 4;
this.Sc_BRFHKB.Tag = "鍙戣揣鐪嬫澘";
this.Sc_BRFHKB.UseVisualStyleBackColor = true;
@@ -308,10 +292,9 @@
this.label12.BackColor = System.Drawing.Color.Transparent;
this.label12.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(187, 630);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(125, 420);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(137, 29);
+ this.label12.Size = new System.Drawing.Size(93, 19);
this.label12.TabIndex = 81;
this.label12.Text = "閫�鍑虹郴缁�";
//
@@ -319,10 +302,9 @@
//
this.cmdClose.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdClose.Image = ((System.Drawing.Image)(resources.GetObject("cmdClose.Image")));
- this.cmdClose.Location = new System.Drawing.Point(202, 516);
- this.cmdClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdClose.Location = new System.Drawing.Point(135, 344);
this.cmdClose.Name = "cmdClose";
- this.cmdClose.Size = new System.Drawing.Size(110, 110);
+ this.cmdClose.Size = new System.Drawing.Size(73, 73);
this.cmdClose.TabIndex = 12;
this.cmdClose.Tag = "閫�鍑虹郴缁�";
this.cmdClose.UseVisualStyleBackColor = true;
@@ -334,10 +316,9 @@
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(435, 471);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(290, 314);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(137, 29);
+ this.label13.Size = new System.Drawing.Size(93, 19);
this.label13.TabIndex = 85;
this.label13.Text = "閰嶆枡鐪嬫澘";
//
@@ -347,10 +328,9 @@
this.label14.BackColor = System.Drawing.Color.Transparent;
this.label14.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(156, 471);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(104, 314);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(199, 29);
+ this.label14.Size = new System.Drawing.Size(135, 19);
this.label14.TabIndex = 84;
this.label14.Text = "妫�娴嬭繘搴︾湅鏉�";
//
@@ -358,10 +338,9 @@
//
this.Sc_WorkBillProcMaterReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcMaterReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcMaterReportKB.Image")));
- this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(452, 357);
- this.Sc_WorkBillProcMaterReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(301, 238);
this.Sc_WorkBillProcMaterReportKB.Name = "Sc_WorkBillProcMaterReportKB";
- this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillProcMaterReportKB.TabIndex = 83;
this.Sc_WorkBillProcMaterReportKB.Tag = "閰嶆枡鐪嬫澘";
this.Sc_WorkBillProcMaterReportKB.UseVisualStyleBackColor = true;
@@ -371,10 +350,9 @@
//
this.Sc_WorkBillProcTestReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcTestReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcTestReportKB.Image")));
- this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(202, 357);
- this.Sc_WorkBillProcTestReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(135, 238);
this.Sc_WorkBillProcTestReportKB.Name = "Sc_WorkBillProcTestReportKB";
- this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillProcTestReportKB.TabIndex = 82;
this.Sc_WorkBillProcTestReportKB.Tag = "妫�娴嬭繘搴︾湅鏉�";
this.Sc_WorkBillProcTestReportKB.UseVisualStyleBackColor = true;
@@ -386,10 +364,9 @@
this.label4.BackColor = System.Drawing.Color.Transparent;
this.label4.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(642, 471);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(428, 314);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(230, 29);
+ this.label4.Size = new System.Drawing.Size(156, 19);
this.label4.TabIndex = 87;
this.label4.Text = "澶栬喘浠朵粨搴撶湅鏉�";
//
@@ -397,22 +374,47 @@
//
this.Sc_WGJCKKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WGJCKKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WGJCKKB.Image")));
- this.Sc_WGJCKKB.Location = new System.Drawing.Point(698, 357);
- this.Sc_WGJCKKB.Margin = new System.Windows.Forms.Padding(4);
+ this.Sc_WGJCKKB.Location = new System.Drawing.Point(465, 238);
this.Sc_WGJCKKB.Name = "Sc_WGJCKKB";
- this.Sc_WGJCKKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WGJCKKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WGJCKKB.TabIndex = 86;
this.Sc_WGJCKKB.Tag = "澶栬喘浠朵粨搴撶湅鏉�";
this.Sc_WGJCKKB.UseVisualStyleBackColor = true;
this.Sc_WGJCKKB.Click += new System.EventHandler(this.Sc_WGJCKKB_Click);
//
+ // Gy_WLKB
+ //
+ this.Gy_WLKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Gy_WLKB.Image = ((System.Drawing.Image)(resources.GetObject("Gy_WLKB.Image")));
+ this.Gy_WLKB.Location = new System.Drawing.Point(633, 238);
+ this.Gy_WLKB.Name = "Gy_WLKB";
+ this.Gy_WLKB.Size = new System.Drawing.Size(73, 73);
+ this.Gy_WLKB.TabIndex = 88;
+ this.Gy_WLKB.Tag = "鐗╂枡鐪嬫澘";
+ this.Gy_WLKB.UseVisualStyleBackColor = true;
+ this.Gy_WLKB.Click += new System.EventHandler(this.Gy_WLKB_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(629, 314);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(93, 19);
+ this.label5.TabIndex = 89;
+ this.label5.Text = "鐗╂枡鐪嬫澘";
+ //
// MESMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
- this.ClientSize = new System.Drawing.Size(1257, 945);
+ this.ClientSize = new System.Drawing.Size(838, 630);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.Gy_WLKB);
this.Controls.Add(this.label4);
this.Controls.Add(this.Sc_WGJCKKB);
this.Controls.Add(this.label13);
@@ -440,7 +442,6 @@
this.Controls.Add(this.Sc_MESBeginWorkBill_Fast);
this.Controls.Add(this.Sc_ICMOBillList_K3);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MESMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "娆цMES绯荤粺";
@@ -478,5 +479,7 @@
private System.Windows.Forms.Button Sc_WorkBillProcTestReportKB;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button Sc_WGJCKKB;
+ private System.Windows.Forms.Button Gy_WLKB;
+ private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
index b3df017..b7d25ef 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
@@ -211,5 +211,11 @@
Kanban.Sc_WGJCKKB oSc_WGJCKKB = new Kanban.Sc_WGJCKKB();
oSc_WGJCKKB.ShowDialog();
}
+
+ private void Gy_WLKB_Click(object sender, EventArgs e)
+ {
+ Kanban.Gy_WLKB oGy_WLKB = new Kanban.Gy_WLKB();
+ oGy_WLKB.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
index 0da595b..fd7201c 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
@@ -1470,6 +1470,94 @@
iP8AmuaVyJbr4RsAAAAASUVORK5CYII=
</value>
</data>
+ <data name="Gy_WLKB.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABMdSURBVHhe7Z0JeE3X2seX296vz9fvfkVU3aJkcCWC
+ GNLgaw0l1EXEVIpQY4mEolcJioghxuKKRiQSJEiiag5ijjmJWWIKkZiLmqqmynvfd59zIo1XkrPP4Tvn
+ 7LWf5/ckec/eyT7r/19rvWvYJwIAJBqGDUq0AxuUaAc2KNEObFCiHdigRDuwQYl2YIMS7cAGJdqBDUp0
+ WPrB3bOxsEGJDks/uHs2FjYo0ZHvKMYgFi5cKBYsWKAaUw7uno2FDb5JVv/8s8WiP/IK/hfkLT30fe5r
+ nLhFwZSDK09jYYPmBAvSHhmJ7EQuI08RsBZWrVypsHLFClgRFwfxsbHwM76HmOjoXqjBfyFvI8XUtgSm
+ HFx5GwsbNAdYeH9DQpEnaWlpcOvWLfj999/h+fPn+LL1HDk5OfDs2TPl3u/fvw+//vorHDx4ENavX58T
+ ER7uhzr8N6LaBKYceHsmwwZNBUV3Qk6dPHnS6gTPf9D9P378GO7duwe//PILZGVlwdGjR2Hbtm2wbt26
+ nJCQkG9Ri3cRVSYw5cDbMxk2aAoofGnkHB74o/Uff/zxBzx8+BBu3rwJmZmZcPz4cUhJSYE9e/YoJli7
+ dm1OyNy5o1APVSYw5cDbMxk2aAoofvyp9HSl6bQFnj59qtT+K1euALVoSUlJivh5TbBmzRqYFxIyDjUx
+ 2gSmHFz5GwsbVAuKX2/Xzp1sQVorZIC7d+/CxYsXITU1FTZs2AA7duyAY8eOvWSC+aGhwaiLUSYw5eA0
+ MBY2qBY0QPhFbCa5grRWyAB37tyBCxcuwL59+yA+Ph4SExPh1KlTL5kgISEBQkNDp6M2RTaBKQengbGw
+ QbWgAU5QbeEK0loxGOD8+fOwe/duiImJgU2bNik/v8oEYWFhP6I+RTKBKQengbGwQbWgAe48efKELUhr
+ xWCAjIwMpf9fvHgxbNy4EbKzsws0AYq74J133vkf1KlAE5hyUJnX9Khb+2s/v598Bw6cXMXVtUR+TQqD
+ DaoFDaAMm2wJMjSN/WlUsxPzm6ioKKUFuHbtWqEmiAgPX1KYCUw56tRv+K5nS6+syGXLwNffD+zt7W86
+ OTu34LR5FWxQLVowQGRkJGzevFkZFhbRBHFOTk7/i3qxJhAffviCsmVfUK7cn/noIyEqVBCiUiUhqlcX
+ wsNDNPPyDopaHgsb8W+1btMGKlSoAB/ZO5zmtHkVbFAtWjEAdQEUK6oJFkZErHZzc3uPM4FR4js5CVG7
+ thDNm9cUnTotdOvc9WlScgrMnDMbatasCTXc3aFUqdKJnDavgg2qRSsGoKEgiW+MCSIXLkxo6ulZPL8J
+ iiQ+4eAgRI0aQrRo0UD4+z8S48eDmDgRyiCNOncGB0dHcHCq9NzO7n13TptXwQbVQgagmTNbgqaBb9++
+ DWfPnlUMgMLR7J8iugoTbGvXtm3JvCYokvgVKwrh4iJEo0bviL59z4pp00AsWQJi+XIQ4eEgAgPhLW9v
+ KP73sks4XQqCDapFKwZYtWqVIraxJqCuIyoyMsnHx6eUwQSFik9NP9V+avo7dgwQY8fqxMdWSGAuIvBe
+ xLx5IAYNAtGkSTSnS0GwQbWYYoD7yDkL5DQa4BAaYDsaYPmuXTAVu4CYlSsVkdWaYFFU1AG/AQPK5Jrg
+ FeK369LNftXGjZ07+nQrXtvL+3MU+YH48Ucs6NUgtmwBgb9PYGukxPz8QDRunMDpUhBsUC1qDfAB98ss
+ hWfPQNy5AwIFFUlJIHAYODA+XhHXRBMcHjx4MCYA+UygF9+zhZfDqHGBD/81ciR06+t7deKMWbB06zZw
+ XbFCV/O3bweRmKjrBiZMANGlC4g6dYZwb6Eg2KBayAC0dm4sXTHZEjk5lsnTpyBQWJGRAQJbADLAACx0
+ EtUUE2zatIlMcHzE8OHlc02gF5+a/XoNP1vVuXt3aN7a+3nfQUMh5WQa3Hr4ENIxGe0REqITnmo/Nf/+
+ /iA8PbNF1arvcroUBBtUi1oDWDKPHj1SNrNQDkCLQJQDLME+mMQ0hwkWL1p0Omj8eMzy9CZA8Rt4fv55
+ x64+jxo3bdqmfZdu2euw5l+5cxfuPXkMaxM2QAC2CjTurztuHIjvvgPRti2IWrW6cpoUBhtUi1YMQENB
+ EtEcJtisM0HGlODgSmSCmh51/+pe99O0Vq29g4S7u6j/RcdtcWvWwIUrV+DA4UMwfeZM6NGjB3wzbBh8
+ P2EyeNRvBKK2+yHh7FyM06Qw2KBayAA0d25L0FYwEvLMmTOwHfvdiIgICMehF4lnNhNgn75k8eKsGdOn
+ u3zyWZMhbdp3yGrUuPG7omnT9zDxu/aPqVNhSlgYBAYFQe8+faBjp04we0E49OzTH6pVqwnFy5YL4fQo
+ CmxQLVoxwPz585VEzpwmoCXmsLCwq9gC3G/SrFkXpTvo2jVYTJoEIjYWxPr1UGrUKKhbvz58891w8B86
+ DP7vk4ZQsaJDjp3d+9U4PYoCG1SLVgwQgkkYbQAxtwkGDfkWuvfo8XTO7NnuWPtdxLBhjwV2OSIhQTcC
+ wS6Ifnbt2Qtqu9cBBwcnsPvg72GcFkWFDaqFDEBTp7YE7QekzaCnT59WRKLmf86cObACh2PmNMGKlSvB
+ rfbHELN0KUQvWXJL9O+fJH74AQSWqSI8jUDwb4lFi0BgEohZP7zt4LjYzq7UW5wWRYUNqkUrBpg1axYs
+ W7bMbCagXca9+/nCmHGByu8JJpHHjAERE6Ob8KHav3UriJ9+AjF9OoiePUF8+ukpUbnyXzkdjIENqsUU
+ AzxCzmDGbWmk//YbpNy4AVvT02EpiYMGmDRjhrIxxFwmiMXf0axla2XDyU7kb1TDaXaPpnt379bVfvoe
+ E0ExdCiIf/4TRLVqzYW9PauDMbBBtag1QJl793SzbZYIiiWyskAcOaLri+fNA2/Mymk4aA4T0Cpjtz79
+ IHTBAuX8obS4Q4lffLyu6ScD4O/MnfHr3BmEh8d64eioLBJxOhgDG1QLGYAWT4ylJRng9m3LBGu/yMx8
+ YQCsmWSABSiYOUwwP2IhNPD8HKZi074XzxcBAUqip0z3kvjU/K9b92LGr0mTx8LF5R/KCqGtGMCS+Q27
+ AMoBaBSwC5viRdg/Uw5ABjDVBLTVvJmXN3Tv1RuS8bwv5s4FMXOmboWPxN+7V5cDUC5AOUH79iBq156u
+ 1H5aJZQGeP2QAWgmkDaF0rbwuLg4mItC0Uhg2rRpEBwcDJOwyaavU6ZMUZiOtXkqthIzMFeg72eiqIbv
+ 6SudS68PHzECqtVyhz5ffw2+VPNxnC+io3UJ3/79utpPK39oOIHn/KVFCxCVKhU31H6LzAFo6tSWIAPQ
+ fgCqrYcOHVJ2A9FUMAkZGBgIIzFhG4FCBqCA9P0oFJEYPXo0jMFaS4wdOxbGjRunnD9+/HgICgqCCdif
+ t2zlBU2aNoXx+PP7lNxRM0/JHhpNgboB/Fti+HAQXl7gT3sB9OsFJL40wBuAhoG0Lfzq1atKM06twPr1
+ 62E5JmXU/IdhZh4aGqp8pS6Bhok0WWRYM6Aug6AFpGis3fRcwVIc61OXMcDPD8ahKQbTeH/iRF3iR7X+
+ 4EFd5k/DPmwpRLduUBWHfvSIumIAfe2njSKcDsbABtViiwagmUB6NpD67EuXLikmoH6dHhKhfp6mcA1s
+ xaabYgTNGtIOIoJyBxri0TXEXuzbyUj02nYS+vvvdYkfNf0HDryo/TQiGDIERPPmsB3j9DkFigH04lMu
+ wOlgDGxQLWQAKjBbglqABw8eKK0AJYP0kCg9JkZJIX3uwYkTJxTowVH6OT09XYGMQtAEEp1L0IoiDfso
+ nyAoKfSnJh67E2Vtn4Q31H5qDahVwGFfJ+xO6B4UA1DtJ/GlAd4MZACCPhyCHnuj4RsZ4QYOD69fv65k
+ 9PQ1L/SaATrXALUiBCWVxDE0g7LHD7sERXQaBpIJcBQhsFsRAweCaNUKzmH+QfegGCCP+PSMAKeDMbBB
+ tZABDAVmLDcx2UrHQrZE0rALMHACW4ITaIIiQefqOYnmMXATazMll63nz9fN+G3aBCI5WQd2C8qkD232
+ 6NABgrBrMJQRlW+u+PSMgK0Y4CN0uMDmUUtUJKFpZo8SPRrv4whDqf00Cvj3v5Vh3wfY/P+K5jGUU64B
+ 9OILZ2dWB2Ngg2pRa4CumFwJ7CMF9peaAHMDJbun/p82d5L41PzT1C/NA+CwkoZ9cZhY5i0nxQAG8StX
+ tkwDUNMmKZjZ1ORT4kdTvJT0HT6sm/hZs0YX794dGn7zzUvX5RpALz49LMLpYAxsUC3SAIVzFZNB5bEu
+ SvxoupfET03VLfhQi0ATQi1bQgqOLPJfqxjAID5RpQqrgzGwQbVIAxROf5rXp23dNM6npv/oUV0OQOLS
+ KiD2+77TprHX/skAKL5wdWV1MAY2qBa6QRqvSniSKc8JCtIlftTkHz+uq/204ENr/YMGwVvt2sEVHEpy
+ 1ysGyCO+NICV0YDm+iMidMkeLS8Te/aAiIvTDfvat4fZsbHstYRiAHpI1GCAqlVZHYyBDapFGuDVxO7D
+ Zp62c1HiR+N9avopAaQ9BrQMjMM+59694e69e+z1hGKAPOKLatVYHYyBDaqFbpBmzCR/5tz5C1DDfyBm
+ +DN1iR/1/QTNBeQZ9iXga9z1BnINoBffpgxwFzlx+7ZN4jNiJHTu2Rc6fdULgmPjwI0SQGr6aeMHPeuP
+ w742AQFsueRFMQCJbzBA9eqsDsbABtVCN0grZ8ZiT4kQLYPaIpFR4NO3P/QeMAjWbdkKh9LSYd3mTdBq
+ 2DDdYs/gwUrtp4c+ubLJS64B9OLbjAFaHjumWwyh5MjGaPy1L/TwHQhT54RA+oVMOH/5MsxfGAEtW7WC
+ 8vb2UKxhQxiOOQBXLvnJNYBefPrIGE4HY2CDalFrAFslbHksPdsPfQYOgeQTJ+HyrVuwHfv5fr6+UN3N
+ DUqXKQOOzi6Qcf48e31+FAPkEd8iDUBLphIdXtjnU+3fnLQbsm78AmkZ5yBwQhA0wFpftmxZsHdygl7+
+ /uy1HC8ZoGZNVgdjYINqkQZ4wY5dSeDZohV06OIDaxMT4eK1axAVEw1t27UDR0dHKFehAjhVd1P2B3DX
+ c+QaQC++RRqAds5I7kDQ5CnwVT8/2HfkKMSvWQPDcKjng9l+9erVlabfobKz8llD3LWvItcAevGlASwU
+ +q8iNOzbsH0HXLh2HY6fOQ0Bo0eBIzb5JUuWVJr+hm3bstcWhGKAPOJLA1goy+JXwNhJU+D42XOQcekS
+ hEdFQmtvb3BwcICSpUqBXblykJGZyV5bENIAVsLg7wJg2959cDY7G9Zu3Ag9evUC16pVoXTp0lDJpQok
+ YE7AXVcYNm2AG7dvw1FMlKydLdjnL4qNgyOnTsOu/ftg8L++BQ8PDyiD/b49Jn9zo2PgJr5XrgwKw2YN
+ UJmWQ2mJ1AZw/WEWJO7cBXtTU2HilGBo9NlnUA6b/A9x2Pf2V1/lnldvxw62LArCKgxA26aNpT3Ni1PB
+ 0F54K2dsdDRsxfczPyICWrVuDfbU79vZwfuenrrdvnQeZv899u9ny6IgqHzzl7mpsEG1qDWArUAPfURg
+ E0/jfZ/u3aBKlSpgh+LXqVdPeQiEu8YYrMIA9CClVlmF4/0JwcHQb4AvuH/8sdLv09AvOTmZPd9YpAEs
+ nOEjR8IXX34JHnXqKFO9pXDItxpNwZ2rBmkAC4YeCWvbvj3UqFULypcvDyVKlIAF4eHsuWqxCgMYnnvT
+ GvsPJoPvgAHg5lYLSn9QBkaMCGDPMwVpAAsmLDJKP9tXCSZPDv7TQ6DmQhrAgunwZVes/W4wevQY9nVz
+ YBUGMDwCrYaj2dmQmpVVKOeuXGGv//8ikSaysCi9cNyf9zFwc2OzBnDF65T98tZKg4ZQ7L33oOnq1ez7
+ Mxc2a4DmtDeePiKFPhLFGqlRQ9nb74FDPu79mQurMEDeT8TQAvQpIGnp6exr5kYaQONYhQHyfj6OxLxI
+ A2gcaQCNYxUGyP+RaRLzIQ2gcaQBNI5VGIA+OVPyepAG0DjSABpHGkDjWIUB6B8rSF4P0gAaRxpA41iF
+ Aeg/akheD9IAGkcaQONYhQEuX74seU1IA2gcaQCNIw2gcazCAPTfNSWvB2kAjSMNoHGswQB36d+sczcv
+ MY3s7GwywGOu3E2BDaoFbzDt7Jkzys1KzAt9/hCW7zmu3E2BDaoFbzDi8OHD7BuQmMYRLFcs3yiu3E2B
+ DaoFb/CTLYmJ7BuQmMaWLVvIAA25cjcFNmgKeJM/HzhwgH0TEnUcPHiQxN/IlbepsEFTwBstjZxLSUlh
+ 34zEOFJTU0n8S0g5rrxNhQ2aCt5sJeTs/n37lI9Ol6iDyo8qE+LKlbM5YIPmAG+6OBKDPKcm7FR6OmRm
+ ZrJvVKIjIyNDKSd9k5+jL78SXPmaCzZoTvANuCDBSDLyAKE3J3kZEvw6QuVE5VWFK09zwwbfJPhGNQ1X
+ Jm8SNvgm4QpFS3Bl8iZhgxLtwAYl2oENSrQDG5RoBzYo0Q5sUKId2KBEO7BBiXZggxLtwAYl2oENSrQC
+ iP8AmuaVyJbr4RsAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>45</value>
</metadata>
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index c1cb681..95849dc 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index d4f984c..be6ecd0 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 8967cf3..386e7fb 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,14 +3,19 @@
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
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
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
+>>>>>>> 4a706955f6250fd50961dcde68c873f4d32a391e
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index c1cb681..95849dc 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index d4f984c..be6ecd0 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 985e9f9..081fe4b 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -666,13 +666,10 @@
}
if (HBarCodeType == "鍞竴鏉＄爜")
{
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
-
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
+ string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 骞� + 杞﹂棿浠ｇ爜锛�060113锛� + 鏈� + 鍨嬪彿 + 鏃� + 娴佹按鍙�
+ TM = 1 + sYear + 060113 + sPeriod + HModelLeft + sDay + LSH;
}
HEntryID = j + 1;
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index c9a3aa8..86a0289 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -305,7 +305,7 @@
return objJsonResult;
}
- var ds = oCN.RunProcReturn("select * from Gy_BadReason where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadReason");
+ var ds = oCN.RunProcReturn("select * from Gy_BadReason with(nolock) where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadReason");
if (ds.Tables[0].Rows.Count > 0)
{
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
diff --git a/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
index 4b70e17..20a17db 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
@@ -18,6 +18,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
/// <summary>
/// 杩斿洖鏁呴殰绫诲埆鍒楄〃
@@ -169,7 +170,7 @@
//淇濆瓨鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_Gy_ConkType_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
+ string sql1 = "exec h_p_Gy_ConkType_BeforeSaveCtrl '" + HNumber + "','" + HName + "'," + HUSEORGID + ",1,0";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_ConkType_BeforeSaveCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
@@ -185,7 +186,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
objJsonResult.data = null;
oCN.RollBack();
return objJsonResult;
@@ -235,7 +236,7 @@
oCN.BeginTran();
//淇濆瓨鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_Gy_ConkType_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
+ string sql1 = "exec h_p_Gy_ConkType_BeforeSaveCtrl '" + HNumber + "','" + HName + "'," + HUSEORGID + ",3," + HItemID;
ds = oCN.RunProcReturn(sql1, "h_p_Gy_ConkType_BeforeSaveCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
@@ -251,7 +252,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
objJsonResult.data = null;
oCN.RollBack();
return objJsonResult;
@@ -306,11 +307,48 @@
oCN.Commit();
}
- objJsonResult.code = "0";
+
+ //鑷姩瀹℃牳鍔熻兘
+ if (HItemID == 0)
+ {
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_ConkType with(nolock) where HNumber='" + HNumber + "' and HUSEORGID = " + HUSEORGID, "Gy_ConkType");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛佽嚜鍔ㄥ鏍稿け璐ユ壘涓嶅埌瀵瑰簲鍗曟嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐩稿悓浣跨敤缁勭粐涓嬶紝鍑虹幇" + ds.Tables[0].Rows.Count + "涓浉鍚岀殑浠ｇ爜锛�" + ds.Tables[0].Rows[0]["HNumber"];
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Gy_ConkType_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ if (sAutoCheck == "Y")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ objJsonResult.Verify = "Y";
+ return objJsonResult;
+ }
+ }
+ }
+
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
@@ -336,7 +374,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ConkTypeList where HitemID=" + HInterID, "h_v_Gy_ConkTypeList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ConkType_Edit where HitemID=" + HInterID, "h_v_Gy_ConkType_Edit");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -364,7 +402,7 @@
}
}
-
+
[Route("DeltetGy_ConkType")]
[HttpGet]
public object DeltetGy_ConkType(string HItemID, string user)
@@ -420,6 +458,17 @@
objJsonResult.data = null;
return objJsonResult;
}
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "" || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_ConkType_BeforeDelCtrl " + HItemID + ",'" + user + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_ConkType_BeforeDelCtrl");
diff --git a/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs b/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
index 880b697..06edf98 100644
--- a/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
@@ -2469,5 +2469,118 @@
#endregion
#endregion
+ #region 鍚姩鐐规 鏈堟煡璇� 鎶ヨ〃
+ [Route("Sc_WorkBeginDotCheckBill/get锘縎c_WorkBeginDotCheckReport")]
+ [HttpGet]
+ public object getSc_WorkBeginDotCheckReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string sDate = dic["sDate"].ToString();
+ string HSourceID = dic["HSourceID"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_WorkBeginDotCheckReport '" + sDate + "','" + HSourceID + "'", "h_p_Sc_WorkBeginDotCheckReport");
+ if (ds.Tables.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds == null || ds.Tables[0].Rows.Count < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撴湀娌℃湁鏁版嵁浜х敓锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 闃查敊楠岃瘉 鏈堟煡璇� 鎶ヨ〃
+ [Route("Sc_WorkBeginDotCheckBill/getQc_PreventErrMouldCheckReport")]
+ [HttpGet]
+ public object getQc_PreventErrMouldCheckReports(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string sDate = dic["sDate"].ToString();
+ string HSourceID = dic["HSourceID"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_Qc_PreventErrMouldCheckReport '" + sDate + "','" + HSourceID + "'", "h_p_Qc_PreventErrMouldCheckReport");
+ if (ds.Tables.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds == null || ds.Tables[0].Rows.Count < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撴湀娌℃湁鏁版嵁浜х敓锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 6c21da1..b21e366 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -2736,6 +2736,114 @@
}
#endregion
+ #region 宸ュ巶鏃ュ巻淇濆瓨锛堟壒閲忥級
+ [Route("MaterOutEntryReport/Sc_ShopCalendarSaveList")]
+ [HttpPost]
+ public object Sc_ShopCalendarSaveList([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMainList(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ public class ClsHSourceList
+ {
+ public long HItemID { get; set; }
+ }
+ public class ClsHWorkHourList
+ {
+ public DateTime date { get; set; }
+ public string week { get; set; }
+ public double workHours { get; set; }
+ }
+ public json AddBillMainList(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//璧勬簮鍒楄〃
+ string msg3 = sArray[1].ToString();//鏁版嵁鍒楄〃
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ List<ClsHSourceList> HSourceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsHSourceList>>(msg2);
+ List<ClsHWorkHourList> HWorkHourList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsHWorkHourList>>(msg3);
+ //閬嶅巻鏇存柊鏁版嵁
+ foreach (ClsHSourceList HSource in HSourceList)
+ {
+ long HSourceID = HSource.HItemID;
+ foreach (ClsHWorkHourList HWorkHour in HWorkHourList)
+ {
+ DateTime date = HWorkHour.date;
+ double workHours = HWorkHour.workHours;
+ ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HDate='" + date + "' and HSourceID=" + HSourceID, "Gy_PlanShifts");
+ string sql = "";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ sql = $"update Gy_PlanShifts set HOverTimes='" + workHours + "' where HDate ='" + date + "' and HSourceID=" + HSourceID;
+ }
+ else
+ {
+ sql = $"insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount," +
+ "HRemark,HUseFlag)values" +
+ $"('{date}','{HSourceID}',0,'{workHours}','1'" +
+ $",'','鏈娴�')";
+ }
+ oCN.RunProc(sql);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ巶鏃ュ巻鎵规敼涓婄彮宸ユ椂
[Route("Gy_PlanShifts/BulkWorkTime")]
[HttpGet]
diff --git a/WebAPI/Controllers/Open_PrintTemController.cs b/WebAPI/Controllers/Open_PrintTemController.cs
index 11ac7be..ef8c5a4 100644
--- a/WebAPI/Controllers/Open_PrintTemController.cs
+++ b/WebAPI/Controllers/Open_PrintTemController.cs
@@ -30,7 +30,7 @@
{
sWhere = " Where 1=1 ";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (HNumber != "")
+ if (HNumber != "" && HNumber != null && HNumber != "undefined")
{
sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
}
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index 898371b..b6db605 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -12,6 +12,8 @@
using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using System.IO;
using SyntacticSugar.constant;
+using Newtonsoft.Json;
+
namespace WebAPI.Controllers.SBGL
{
public class Gy_EquipTypeController : ApiController
@@ -32,6 +34,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//if (!DBUtility.ClsPub.Security_Log("Gy_EquipTypeList", 1, false, user))
//{
// objJsonResult.code = "0";
@@ -40,13 +43,22 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag,HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HCloseEmp,HCloseTime from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");
-
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileTypeList where 1=1 " + sWhere+ " order by HItemID ", "h_v_Gy_EquipFileTypeList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception ex)
@@ -134,7 +146,8 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- string msg4 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string HUseOrgID = sArray[3].ToString();
if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4))
{
@@ -159,6 +172,8 @@
bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
bool HEndFlag = list[0].HEndFlag;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
@@ -170,19 +185,38 @@
return objJsonResult;
}
-
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_EquipType_BeforeSaveCtrl '" + HNumber.ToString() + "','" + HName + "'," + HUSEORGID + ",1,0", " h_p_Gy_EquipType_BeforeSaveCtrl ");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
oCN.RunProc("Insert into Gy_EquipFileType " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HMakeEmp) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HMakeEmp,HUSEORGID,HCREATEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
- "," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate(),'" + msg4 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate(),'" + msg4 + "'," + HUSEORGID + "," + HCREATEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏂板鎴愬姛锛�";
@@ -242,6 +276,7 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
+ long HUSEORGID = list[0].HUSEORGID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -262,6 +297,25 @@
return objJsonResult;
}
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_EquipType_BeforeSaveCtrl '" + HNumber.ToString() + "','" + HName + "'," + HUSEORGID + ",3," + HItemID, " h_p_Gy_EquipType_BeforeSaveCtrl ");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -275,6 +329,7 @@
",HModifyTime=getdate()" +
",HModifyEmp='" + msg4 + "'" +
",HStopflag='" + HStopflag + "'" +
+ ",HUSEORGID=" + HUSEORGID +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -307,7 +362,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_EquipFileType where HItemID=" + HInterID, "Gy_EquipFileType");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileTypeEdit with(nolock) where HItemID=" + HInterID, "h_v_Gy_EquipFileTypeEdit");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -352,6 +407,26 @@
return objJsonResult;
}
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_EquipType_BeforeAuditCtrl " + HInterID + ",'" + Type + "'", " h_p_Gy_EquipType_BeforeAuditCtrl ");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏍￠獙鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
ClsPub.CurUserName = user;
oCN.BeginTran();//寮�濮嬩簨鍔�
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
index b66e111..78051fa 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -680,6 +680,8 @@
oItem.HStopBeginWorkTime = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")));
oItem.HStopEndWorkTime = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.AddDays(30).ToString("yyyy-MM-dd")));
oItem.HRemark = "蹇嵎鍋滃伐";
+ oItem.HStopType = "蹇嵎鍋滃伐";
+ oItem.HStopReason = "蹇嵎鍋滃伐";
oBill.omodel = oItem;
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index 83acfaa..89735cf 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -506,7 +506,7 @@
#region 鎻愭枡璁″垝鍗� 鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)
public class ReportPODemandPlanBill
{
- public int? HORGID;
+ public string HORGID;
public DateTime HBEGINDATE;
public DateTime HENDDATE;
public int? HMATERIALID;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
index b0bc307..028976c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -187,7 +187,7 @@
#region 榻愬鍒嗘瀽鎶ヨ〃
public class ReportMOMaterReadysBill
{
- public int? HORGID;//缁勭粐
+ public string HORGID;//缁勭粐
public int? HMATERIALID;//鐗╂枡
public string HDeptID;//鐢熶骇杞﹂棿
public int? HSCZYID;//鐢熶骇璧勬簮
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index c0c90bf..1bcc961 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -21272,18 +21272,36 @@
//鑾峰彇鎵�鏈夋ā鍧楅〉闈�
[Route("Web/ModePageList")]
[HttpGet]
- public object ModePageList()
+ public object ModePageList(string HMakeName, string HType)
{
try
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏�
+
+
+ string sql = "select * from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' and isnull(Hurl,'') like'%html%' order by HPosition";
+ ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
+ if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
+ {
+ string sql1 = "select * from Gy_MenuDefineSet where HMakeName=" +
+ "(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
+ "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='" + HMakeName + "' order by len(c.GroupName )) and isnull(Hurl,'') like'%html%'";
+ ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
+ if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
+ {
+ sql = "Select * from h_v_Gy_Menu_1 Order by HPosition,len(HitemID),HitemID ";
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
+ }
+ }
+
+
+ //ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu_1"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏�
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
- objJsonResult.data = ds;
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
catch (Exception e)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs"
index fd20749..0cb826d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs"
@@ -938,7 +938,64 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
+
+ #region 鐜妫�娴� 鏈堟煡璇� 鎶ヨ〃
+ [Route("QC_EnvironmentTestDotCheckBill/getQC_EnvironmentTestDotCheckReport")]
+ [HttpGet]
+ public object get锘縌C_EnvironmentTestDotCheckReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string sDate = dic["sDate"].ToString();
+ string HEnvironmentTestSchemeID = dic["HEnvironmentTestSchemeID"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_EnvironmentTestDotCheckReport '" + sDate + "','" + HEnvironmentTestSchemeID + "'", "h_p_QC_EnvironmentTestDotCheckReport");
+ if (ds.Tables.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds == null || ds.Tables[0].Rows.Count < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撴湀娌℃湁鏁版嵁浜х敓锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatusController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatusController.cs"
index 45a9080..a048b9c 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatusController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatusController.cs"
@@ -1,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
@@ -16,6 +18,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ public DAL.ClsGy_EquipStatus_Ctl BillOld = new DAL.ClsGy_EquipStatus_Ctl();
#region 璁惧鐘舵�� 鍒楄〃
[Route("Gy_EquipStatus/Gy_EquipStatusList")]
@@ -57,6 +60,46 @@
}
#endregion
+ #region 璁惧鐘舵�� 缂栬緫鍒楄〃
+ [Route("Gy_EquipStatus/Gy_EquipStatusEdit")]
+ [HttpGet]
+ public object Gy_EquipStatusEdit(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = string.Format(@"select * from h_v_Gy_EquipStatus_Edit where 浣跨敤缁勭粐='" + Organization + "'");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipStatus_Edit");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 璁惧鐘舵�� 缂栬緫
[Route("Gy_EquipStatus/Gy_EquipStatusEdit")]
[HttpPost]
@@ -68,9 +111,11 @@
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg1 = sArray[0].ToString();
string msg2 = sArray[1].ToString();
+ string OperationType = sArray[2].ToString();
//string msg_HUSEORGID = sArray[2].ToString();
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
ListModels oListModels = new ListModels();
@@ -88,7 +133,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
if (oItem.HName.Trim() == "")
@@ -96,12 +141,12 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_EquipStatus where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EquipStatus");
+ ds = oCN.RunProcReturn("select * from Gy_EquipStatus with(nolock) where HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EquipStatus");
if (oItem.HItemID == 0)
{
if (ds.Tables[0].Rows.Count > 0)
@@ -200,7 +245,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
//oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
@@ -212,21 +257,57 @@
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
- if (oBill.oModel.HItemID == 0)
+ if (Convert.ToInt32(OperationType) == 1 || Convert.ToInt32(OperationType) == 2)
{
- bResult = oBill.AddNew();
+ bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
- bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
{
+ //鑷姩瀹℃牳鍔熻兘
+ if (oBill.oModel.HItemID == 0)
+ {
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_EquipStatus with(nolock) where HNumber='" + oBill.oModel.HNumber.Trim() + "' and HUSEORGID = " + oBill.oModel.HUSEORGID, "Gy_EquipStatus");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛佽嚜鍔ㄥ鏍稿け璐ユ壘涓嶅埌瀵瑰簲鍗曟嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐩稿悓浣跨敤缁勭粐涓嬶紝鍑虹幇" + ds.Tables[0].Rows.Count + "涓浉鍚岀殑浠ｇ爜锛�" + ds.Tables[0].Rows[0]["HNumber"];
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Gy_EquipStatus_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ if (sAutoCheck == "Y")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ objJsonResult.Verify = "Y";
+ return objJsonResult;
+ }
+ }
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
else
@@ -234,7 +315,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -243,7 +324,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -267,8 +348,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_EquipStatus where HItemID=" + HItemID, "Gy_EquipStatus");
+
+ ds = oCN.RunProcReturn("select * from Gy_EquipStatus with(nolock) where HItemID=" + HItemID, "Gy_EquipStatus");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -277,10 +358,21 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+ else
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "" || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
if (HStopflag)
{
- oCN.RollBack();//鍥炴粴浜嬪姟
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
@@ -289,7 +381,7 @@
}
oCN.RunProc("delete from Gy_EquipStatus where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
@@ -307,5 +399,168 @@
}
}
#endregion
+
+ #region 璁惧鐘舵�佸鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Gy_EquipStatus/CheckGy_EquipStatus")]
+ [HttpGet]
+ public object CheckGy_EquipStatus(string HInterID, int Type, string user)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_EquipStatus_BeforeAuditCtrl " + HInterID + ",'" + Type + "'", " h_p_Gy_EquipStatus_BeforeAuditCtrl ");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏍￠獙鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ DBUtility.ClsPub.CurUserName = user;
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.AuditByID2(int.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.DeAuditByID2(int.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐘舵�佺鐢ㄣ�佸弽绂佺敤
+ [Route("Gy_EquipStatus/StopGy_EquipStatus")]
+ [HttpGet]
+ public object StopGy_EquipStatus(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ var ds = oCN.RunProcReturn("select * from Gy_EquipStatus with(nolock) where HItemID=" + HInterID, "Gy_EquipStatus");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_EquipStatus set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Gy_EquipStatus set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationController.cs"
index 9a2db52..b1932ff 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationController.cs"
@@ -282,8 +282,8 @@
foreach (Models.Gy_MateNumRelation_Sec oItem in lsmain)
{
//閲嶆柊鍐欏叆鍏宠仈鏁版嵁
- oCN.RunProc("insert into Gy_MateNumRelation_Sec (HCusID,HMaterID,HCusRelationNumber,HCusRelationName,HMaker,HMakeDate) " +
- "values ('" + msg3 + "','" + oItem.HMaterID + "','" + oItem.HCusRelationNumber + "','" + oItem.HCusRelationName + "','" + msg4 + "',getdate() " +
+ oCN.RunProc("insert into Gy_MateNumRelation_Sec (HCusID,HMaterID,HCusRelationNumber,HCusRelationName,HMaker,HMakeDate,HCusRelationModel,HTemplateID) " +
+ "values ('" + msg3 + "','" + oItem.HMaterID + "','" + oItem.HCusRelationNumber + "','" + oItem.HCusRelationName + "','" + msg4 + "',getdate(),' " + oItem.HCusRelationModel + "'," + oItem.HTemplateID +
")");
}
oCN.Commit();
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 3b55170..74778b0 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -952,11 +952,18 @@
/// <returns></returns>
[Route("WEBSController/GetEquipList_Json")]
[HttpGet]
- public object GetEquipList_Json(string Equip)
+ public object GetEquipList_Json(string Equip,int HCenterID)
{
try
{
- ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName from h_v_Gy_EquipFileBill where HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%'", "h_v_Gy_EquipFileBill");
+ if (HCenterID !=0)
+ {
+ ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName,HCenterID from h_v_Gy_EquipFileBill where HCenterID='"+HCenterID+"' and ( HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%')", "h_v_Gy_EquipFileBill");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName from h_v_Gy_EquipFileBill where HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%'", "h_v_Gy_EquipFileBill");
+ }
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagController.cs"
new file mode 100644
index 0000000..28f39b5
--- /dev/null
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagController.cs"
@@ -0,0 +1,676 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鐢熶骇绠＄悊.瀹㈡埛鏍囩
+{
+ public class Sc_CustomerTagController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ public DAL.ClsSc_CustomerTagInfo BillOld = new DAL.ClsSc_CustomerTagInfo();
+
+ #region 瀹㈡埛鏍囩淇℃伅 鏌ヨ-鍒嗛〉
+ [Route("Sc_CustomerTagInfo/PageList")]
+ [HttpGet]
+ public object PageList(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_CustomerTagInfo_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_CustomerTagInfoList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Sc_CustomerTagInfoList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn("exec h_p_Sc_CustomerTagInfoList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Sc_CustomerTagInfoList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鏍囩淇℃伅 缂栬緫鑾峰彇淇℃伅
+ [Route("Sc_CustomerTagInfo/EditCX")]
+ [HttpGet]
+ public object EditCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_CustomerTagInfoEdit where hmainid=" + HInterID, "h_v_Sc_CustomerTagInfoEdit");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鏍囩淇℃伅 淇濆瓨
+ [Route("Sc_CustomerTagInfo/SaveCustomerTagInfo")]
+ [HttpPost]
+ public object SaveCustomerTagInfo([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+ string OperationType = sArray[3].ToString();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_CustomerTagInfo_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSc_CustomerTagInfo oBill = new DAL.ClsSc_CustomerTagInfo();
+ List<Model.ClsSc_CustomerTagInfoMain> lsmain = new List<Model.ClsSc_CustomerTagInfoMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getCustomerTagInfoMainByJson(msg2);
+ foreach (Model.ClsSc_CustomerTagInfoMain oItem in lsmain)
+ {
+ oItem.HMaker = user;
+ oItem.HUpDater = user;
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsSc_CustomerTagInfoSub> ls = new List<Model.ClsSc_CustomerTagInfoSub>();
+ ls = oListModels.getCustomerTagInfoSubByJson(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_CustomerTagInfoSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false;
+ oItemSub.HCloseMan = "";
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Convert.ToInt32(OperationType) == 1) //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (Convert.ToInt32(OperationType) == 4) //涓嬫帹淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ if (BillOld.ShowBill(lsmain[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;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鏍囩淇℃伅 鏂囦欢涓婁紶
+ [Route("Sc_CustomerTagInfo/Sc_CustomerTagInfo_Excel")]
+ [HttpPost]
+ public object Sc_CustomerTagInfo_Excel()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HMaterID", typeof(Int32));//鐗╂枡ID
+ tb2.Columns.Add("HCustID", typeof(Int32));//瀹㈡埛ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ //濡傛灉琛ㄦ牸绗琲琛岀殑绗竴鍒椾负绌猴紝鍒欏垽鏂负杩欎竴琛岀殑鏁版嵁涓虹┖锛岃烦鍑哄惊鐜苟涓斾笉鎶婃暟鎹啓鍏� tb2
+ if (ExcelDs.Tables[0].Rows[i][0].ToString() == "")
+ {
+ continue;
+ }
+ else
+ {
+ tb2.Rows.Add(row);
+ }
+ }
+
+ var error = "";
+
+ //鏌ヨ宸ュ簭宸ヤ环娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("鐗╂枡浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮墿鏂欎唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐗╂枡鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮墿鏂欏悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瀹㈡埛浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬鎴蜂唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瀹㈡埛鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬鎴峰悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("EPE%"))
+ error += "娌℃湁鎵惧埌銆怑PE%銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("PU%"))
+ error += "娌℃湁鎵惧埌銆怭U%銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("SKU"))
+ error += "娌℃湁鎵惧埌銆怱KU銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("SIZE1"))
+ error += "娌℃湁鎵惧埌銆怱IZE1銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("SIZE2"))
+ error += "娌℃湁鎵惧埌銆怱IZE2銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("LBS"))
+ error += "娌℃湁鎵惧埌銆怢BS銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("OZ"))
+ error += "娌℃湁鎵惧埌銆怬Z銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("UPC A"))
+ error += "娌℃湁鎵惧埌銆怳PC A銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("SKU2"))
+ error += "娌℃湁鎵惧埌銆怱KU2銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("FABRIC"))
+ error += "娌℃湁鎵惧埌銆怓ABRIC銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("SN鍙�"))
+ error += "娌℃湁鎵惧埌銆怱N鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("灏哄"))
+ error += "娌℃湁鎵惧埌銆愬昂瀵搞�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瀹㈡埛鎸囧畾浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬鎴锋寚瀹氫唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瀹㈡埛鎸囧畾鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬鎴锋寚瀹氬悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瀹㈡埛鎸囧畾瑙勬牸"))
+ error += "娌℃湁鎵惧埌銆愬鎴锋寚瀹氳鏍笺�戠殑鏍囬,";
+
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HMaterNumber = "";
+ string HMaterName = "";
+ string HCustNumber = "";
+ string HCustName = "";
+ string HEPE = "";
+ string HPU = "";
+ string HSKU = "";
+ string HSIZE1 = "";
+ string HSIZE2 = "";
+ string HLBS = "";
+ string HOZ = "";
+ string HUPC = "";
+ string HSKU2 = "";
+ string HFABRIC = "";
+ string HSN = "";
+ string HSize = "";
+ string HCustMaterNumber = "";
+ string HCustMaterName = "";
+ string HCustMaterModel = "";
+
+
+ HMaterNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠ｇ爜"].ToString());
+ HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡鍚嶇О"].ToString());
+ HCustNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀹㈡埛浠ｇ爜"].ToString());
+ HCustName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀹㈡埛鍚嶇О"].ToString());
+ HEPE = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["EPE%"].ToString());
+ HPU = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["PU%"].ToString());
+ HSKU = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["SKU"].ToString());
+ HSIZE1 = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["SIZE1"].ToString());
+ HSIZE2 = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["SIZE2"].ToString());
+ HLBS = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["LBS"].ToString());
+ HOZ = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["OZ"].ToString());
+ HUPC = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["UPC A"].ToString());
+ HSKU2 = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["SKU2"].ToString());
+ HFABRIC = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["FABRIC"].ToString());
+ HSN = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["SN鍙�"].ToString());
+ HSize = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["灏哄"].ToString());
+ HCustMaterNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀹㈡埛鎸囧畾浠ｇ爜"].ToString());
+ HCustMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀹㈡埛鎸囧畾鍚嶇О"].ToString());
+ HCustMaterModel = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀹㈡埛鎸囧畾瑙勬牸"].ToString());
+
+
+ //妫�鏌ヨ〃鏍兼暟鎹�
+ int index = i + 1;
+
+ if (HMaterNumber != "" && HMaterName != "")
+ {
+ //鏌ヨ鐗╂枡
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HModel from Gy_Material with(nolock) where HNumber='" + HMaterNumber + "' and HName='" + HMaterName + "'", "Gy_Material");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鐗╂枡涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //鏌ヨ瀹㈡埛
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_Customer with(nolock) where HNumber='" + HCustNumber + "'", "Gy_Process");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,瀹㈡埛涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HCustID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鐗╂枡淇℃伅涓嶅叏锛堢墿鏂欎唬鐮侊紝鐗╂枡鍚嶇О锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鏍囩淇℃伅 瀵煎叆(淇濆瓨)
+ [Route("Sc_CustomerTagInfo/Sc_CustomerTagInfo_btnSave")]
+ [HttpPost]
+ public object Sc_CustomerTagInfo_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_CustomerTagInfo_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ long HInterID = DBUtility.ClsPub.CreateBillID("10003", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("10003", ref DBUtility.ClsPub.sExeReturnInfo,true);
+
+ string mainSql = "Insert Into Sc_CustomerTagInfoMain" +
+ "(HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HBillStatus" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ") " +
+ "values(" +
+ "" + HInterID +
+ ",'" + HBillNo + "'" +
+ ",getdate()" +
+ ",Year(getdate())" +
+ ",Month(getdate())" +
+ "," + "''" +
+ ",'" + "Excel" + "'" +
+ "," + "getdate()" + "" +
+ "," + "1" + "" +
+ "," + 0 + "" +
+ "," + 0 + "" +
+ ",'" + "''" + "'" +
+ ",'" + "''" + "'" +
+ ") ";
+
+ oCN.RunProc(mainSql);
+
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HMaterNumber = item["鐗╂枡浠ｇ爜"];
+ string HMaterName = item["鐗╂枡鍚嶇О"];
+ string HCustNumber = item["瀹㈡埛浠ｇ爜"];
+ string HCustName = item["瀹㈡埛鍚嶇О"];
+ string HEPE = item["EPE%"];
+ string HPU = item["PU%"];
+ string HSKU = item["SKU"];
+ string HSIZE1 = item["SIZE1"];
+ string HSIZE2 = item["SIZE2"];
+ string HLBS = item["LBS"];
+ string HOZ = item["OZ"];
+ string HUPC = item["UPC A"];
+ string HSKU2 = item["SKU2"];
+ string HFABRIC = item["FABRIC"];
+ string HSN = item["SN鍙�"];
+ string HSize = item["灏哄"];
+ string HCustMaterNumber = item["瀹㈡埛鎸囧畾浠ｇ爜"];
+ string HCustMaterName = item["瀹㈡埛鎸囧畾鍚嶇О"];
+ string HCustMaterModel = item["瀹㈡埛鎸囧畾瑙勬牸"];
+ Int32 HMaterID = Convert.ToInt32(item["HMaterID"]);
+ Int32 HCustID = Convert.ToInt32(item["HCustID"]);
+
+
+ ds = oCN.RunProcReturn("select HMaterID,HCustID from Sc_CustomerTagInfoSub with(nolock) where HMaterID=" + HMaterID + " and HCustID = " + HCustID, "Sc_CustomerTagInfoSub");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = "insert into Sc_CustomerTagInfoSub(HInterID,HEntryID,HRemark,HBillNo_bak,HMaterID,HCustID,HEPE,HPU,HSKU,HSIZE1,HSIZE2,HLBS,HOZ,HUPC,HSKU2" +
+ ",HFABRIC,HSN,HSize,HCustMaterNumber,HCustMaterName,HCustMaterModel,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType)" +
+ $"values('{HInterID}', '{i}','{""}', '{HBillNo}', '{HMaterID}', '{HCustID}', '{HEPE}','{HPU}','{HSKU}','{HSIZE1}','{HSIZE2}','{HLBS}','{HOZ}','{HUPC}','{HSKU2}','{HFABRIC}','{HSN}','{HSize}','{HCustMaterNumber}','{HCustMaterName}','{HCustMaterModel}',{0},{0},'{""}','{""}')";
+ oCN.RunProc(sql);
+
+ i++;
+ }
+ else
+ {
+ oCN.RunProc("update Sc_CustomerTagInfoSub set HEPE='" + HEPE + "',HPU='" + HPU + "',HSKU='" + HSKU + "',HSIZE1='" + HSIZE1 + "',HSIZE2='" + HSIZE2 + "',HLBS='" + HLBS + "',HOZ='" + HOZ + "',HUPC='" + HUPC + "',HSKU2='" + HSKU2 + "',HFABRIC='" + HFABRIC + "',HSN='" + HSN + "',HSize='" + HSize + "',HCustMaterNumber='" + HCustMaterNumber + "',HCustMaterName='" + HCustMaterName + "',HCustMaterModel='" + HCustMaterModel + "' where HMaterID=" + HMaterID + " and HCustID=" + HCustID);
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鏍囩妗ｆ鐢熸垚
+ [Route("Sc_CustomerTagBarCode/Save")]
+ [HttpGet]
+ public object BarCodeSave(string HICMOInterID, string HICMOEntryID)
+ {
+ try
+ {
+
+ if (HICMOInterID == null || HICMOInterID.Equals("") || HICMOEntryID == null || HICMOEntryID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁㈠崟淇℃伅涓嶅叏锛丠ICMOInterID锛�" + HICMOInterID + ",HICMOEntryID:" + HICMOEntryID;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_CustomerTagBarCode_AutoSave " + HICMOInterID + "," + HICMOEntryID, "h_p_Sc_CustomerTagBarCode_AutoSave");
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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
+
+ }
+}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 9c6f0e4..d9110d7 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -2157,6 +2157,35 @@
return objJsonResult;
}
}
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
//鐢熶骇璁㈠崟缂栧彿銆佺敓浜ц鍗曚富ID銆佺敓浜ц鍗曚富ID+瀛怚D
BillNo = oItem.HMainSourceBillNo;
MainId = oItem.HMainSourceInterID;
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 0707b17..ba58962 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -228,6 +228,30 @@
}
/// <summary>
+ /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_CustomerTagInfoMain> getCustomerTagInfoMainByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_CustomerTagInfoMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_CustomerTagInfoSub> getCustomerTagInfoSubByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_CustomerTagInfoSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 閫�璐ч�氱煡鍗曞弽搴忓垪鍖�
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/Gy_MateNumRelation_Sec.cs b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
index 2643e84..3a3ce30 100644
--- a/WebAPI/Models/Gy_MateNumRelation_Sec.cs
+++ b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
@@ -24,6 +24,8 @@
public bool HUsed { get; set; } //使用标记
+ public string HCusRelationModel { get; set; } //客户物料规格
+ public long HTemplateID { get; set; } //打印模板ID
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index f761087..14b2c2c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/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-05-21T11:58:17.4859837Z;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-05-27T05:34:19.9152695Z;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>05/21/2025 19:57:57</publishTime>
+ <publishTime>05/27/2025 13:31:55</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>05/21/2025 19:57:57</publishTime>
+ <publishTime>05/27/2025 13:31:55</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/21/2025 19:57:54</publishTime>
+ <publishTime>05/27/2025 13:31:51</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>05/21/2025 19:57:54</publishTime>
+ <publishTime>05/27/2025 13:31:51</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/21/2025 19:57:48</publishTime>
+ <publishTime>05/27/2025 13:31:44</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>05/21/2025 19:57:48</publishTime>
+ <publishTime>05/27/2025 13:31:44</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>05/21/2025 19:57:49</publishTime>
+ <publishTime>05/27/2025 13:31:45</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>05/21/2025 19:57:49</publishTime>
+ <publishTime>05/27/2025 13:31:45</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>05/21/2025 19:57:44</publishTime>
+ <publishTime>05/27/2025 13:31:40</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>05/21/2025 19:57:44</publishTime>
+ <publishTime>05/27/2025 13:31:40</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/21/2025 19:57:47</publishTime>
+ <publishTime>05/27/2025 13:31:42</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>05/21/2025 19:57:47</publishTime>
+ <publishTime>05/27/2025 13:31:42</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/21/2025 19:57:47</publishTime>
+ <publishTime>05/27/2025 13:31:42</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>05/21/2025 19:57:47</publishTime>
+ <publishTime>05/27/2025 13:31:42</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>05/21/2025 19:57:42</publishTime>
+ <publishTime>05/27/2025 13:31:36</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>05/21/2025 19:57:42</publishTime>
+ <publishTime>05/27/2025 13:31:36</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>05/21/2025 19:57:50</publishTime>
+ <publishTime>05/27/2025 13:31:46</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>05/21/2025 19:57:50</publishTime>
+ <publishTime>05/27/2025 13:31:46</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/21/2025 19:58:05</publishTime>
+ <publishTime>05/27/2025 13:32:08</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/21/2025 19:58:05</publishTime>
+ <publishTime>05/27/2025 13:32:08</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>05/21/2025 19:58:16</publishTime>
+ <publishTime>05/27/2025 13:34:18</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 9efa224..6af9984 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-05-26T12:16:27.4322301Z;True|2025-05-26T18:20:27.4706158+08:00;False|2025-05-26T18:16:05.8755995+08:00;True|2025-05-23T10:08:04.4148373+08:00;False|2025-05-23T10:04:56.4532406+08:00;True|2025-05-19T19:37:04.9188427+08:00;True|2025-05-19T19:22:46.1250782+08:00;True|2025-05-19T09:42:31.7002049+08:00;False|2025-05-19T09:32:01.6350123+08:00;True|2025-05-17T14:14:12.0279596+08:00;True|2025-05-17T13:44:20.1547573+08:00;True|2025-05-17T13:09:56.7254199+08:00;True|2025-05-17T12:22:45.9766542+08:00;True|2025-05-17T11:49:56.8647669+08:00;False|2025-05-17T11:46:23.8688151+08:00;True|2025-05-16T14:56:34.3445988+08:00;True|2025-05-16T13:09:24.9723517+08:00;False|2025-05-16T12:53:18.5385817+08:00;True|2025-05-15T17:17:23.2057769+08:00;True|2025-05-15T16:28:03.1493226+08:00;True|2025-05-15T16:09:34.5928723+08:00;True|2025-05-15T15:50:13.7185578+08:00;True|2025-05-15T15:43:43.9742646+08:00;True|2025-05-15T15:02:16.5848076+08:00;True|2025-05-15T14:28:35.2194847+08:00;False|2025-05-15T14:26:02.0933523+08:00;False|2025-05-15T14:25:16.4746523+08:00;False|2025-05-15T14:23:37.0444052+08:00;False|2025-05-15T14:22:38.2549781+08:00;True|2025-05-15T14:08:47.9908883+08:00;True|2025-05-15T13:30:28.6027783+08:00;False|2025-05-15T13:27:35.2019769+08:00;True|2025-05-14T14:33:50.7542669+08:00;False|2025-05-14T12:58:34.3790659+08:00;True|2025-05-06T18:16:13.1825659+08:00;False|2025-05-06T18:13:36.1768928+08:00;False|2025-04-30T10:51:25.6190120+08:00;True|2025-04-15T13:47:43.0319806+08:00;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+ <History>True|2025-05-30T02:09:42.0861719Z;True|2025-05-30T09:27:19.0448124+08:00;False|2025-05-30T09:22:08.8075236+08:00;True|2025-05-29T15:10:29.6652561+08:00;True|2025-05-29T14:58:05.0587060+08:00;True|2025-05-29T14:39:03.1390234+08:00;False|2025-05-29T14:36:03.2767085+08:00;True|2025-05-29T13:52:51.2348257+08:00;False|2025-05-29T13:45:44.5019969+08:00;False|2025-05-29T13:42:23.7583639+08:00;True|2025-05-28T15:19:47.4421065+08:00;True|2025-05-28T14:35:41.9319120+08:00;True|2025-05-28T14:31:54.4492539+08:00;False|2025-05-28T14:29:48.7367846+08:00;True|2025-05-26T20:16:27.4322301+08:00;True|2025-05-26T18:20:27.4706158+08:00;False|2025-05-26T18:16:05.8755995+08:00;True|2025-05-23T10:08:04.4148373+08:00;False|2025-05-23T10:04:56.4532406+08:00;True|2025-05-19T19:37:04.9188427+08:00;True|2025-05-19T19:22:46.1250782+08:00;True|2025-05-19T09:42:31.7002049+08:00;False|2025-05-19T09:32:01.6350123+08:00;True|2025-05-17T14:14:12.0279596+08:00;True|2025-05-17T13:44:20.1547573+08:00;True|2025-05-17T13:09:56.7254199+08:00;True|2025-05-17T12:22:45.9766542+08:00;True|2025-05-17T11:49:56.8647669+08:00;False|2025-05-17T11:46:23.8688151+08:00;True|2025-05-16T14:56:34.3445988+08:00;True|2025-05-16T13:09:24.9723517+08:00;False|2025-05-16T12:53:18.5385817+08:00;True|2025-05-15T17:17:23.2057769+08:00;True|2025-05-15T16:28:03.1493226+08:00;True|2025-05-15T16:09:34.5928723+08:00;True|2025-05-15T15:50:13.7185578+08:00;True|2025-05-15T15:43:43.9742646+08:00;True|2025-05-15T15:02:16.5848076+08:00;True|2025-05-15T14:28:35.2194847+08:00;False|2025-05-15T14:26:02.0933523+08:00;False|2025-05-15T14:25:16.4746523+08:00;False|2025-05-15T14:23:37.0444052+08:00;False|2025-05-15T14:22:38.2549781+08:00;True|2025-05-15T14:08:47.9908883+08:00;True|2025-05-15T13:30:28.6027783+08:00;False|2025-05-15T13:27:35.2019769+08:00;True|2025-05-14T14:33:50.7542669+08:00;False|2025-05-14T12:58:34.3790659+08:00;True|2025-05-06T18:16:13.1825659+08:00;False|2025-05-06T18:13:36.1768928+08:00;False|2025-04-30T10:51:25.6190120+08:00;True|2025-04-15T13:47:43.0319806+08:00;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/26/2025 20:13:56</publishTime>
+ <publishTime>05/30/2025 09:23:50</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>05/26/2025 20:13:56</publishTime>
+ <publishTime>05/30/2025 09:23:50</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/26/2025 20:13:37</publishTime>
+ <publishTime>05/30/2025 09:23:32</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>05/26/2025 20:13:37</publishTime>
+ <publishTime>05/30/2025 09:23:32</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/26/2025 18:16:37</publishTime>
+ <publishTime>05/30/2025 09:23:04</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>05/26/2025 18:16:37</publishTime>
+ <publishTime>05/30/2025 09:23:04</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>05/26/2025 18:16:43</publishTime>
+ <publishTime>05/30/2025 09:23:14</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>05/26/2025 18:16:43</publishTime>
+ <publishTime>05/30/2025 09:23:14</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/26/2025 18:16:29</publishTime>
+ <publishTime>05/30/2025 09:22:52</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>05/26/2025 18:16:29</publishTime>
+ <publishTime>05/30/2025 09:22:52</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/26/2025 18:16:32</publishTime>
+ <publishTime>05/30/2025 09:22:58</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>05/26/2025 18:16:32</publishTime>
+ <publishTime>05/30/2025 09:22:58</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/26/2025 18:16:32</publishTime>
+ <publishTime>05/30/2025 09:22:58</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>05/26/2025 18:16:32</publishTime>
+ <publishTime>05/30/2025 09:22:58</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>05/26/2025 18:13:03</publishTime>
+ <publishTime>05/30/2025 09:09:56</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>05/26/2025 18:13:03</publishTime>
+ <publishTime>05/30/2025 09:09:56</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>05/26/2025 18:13:04</publishTime>
+ <publishTime>05/30/2025 09:09:57</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>05/26/2025 18:13:04</publishTime>
+ <publishTime>05/30/2025 09:09:57</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/26/2025 20:14:16</publishTime>
+ <publishTime>05/30/2025 10:08:45</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/26/2025 20:14:16</publishTime>
+ <publishTime>05/30/2025 10:08:45</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1e74862..b41c437 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -730,6 +730,7 @@
<Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 64c1b83..1069307 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,9 +1,13 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+<<<<<<< HEAD
+=======
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> 4a706955f6250fd50961dcde68c873f4d32a391e
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b4d1a01
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.1