From 2f53ca83fa03c317fb5db3f6ffdadbafbd78dda6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 06 五月 2026 08:40:19 +0800
Subject: [PATCH] 1
---
DAL/基础资料/公用基础资料/ClsGy_SampleScheme_Ctl.cs | 154 ++++
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 9
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 10
Model/基础资料/基础资料/ClsGy_SampleScheme_Model.cs | 27
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 4
WebAPI/Controllers/条码管理/WEBSController.cs | 262 ++++++
WebAPI/WebAPI.csproj.user | 5
Model/Model.csproj | 3
WebAPI/App_Start/WebApiConfig.cs | 9
WebAPI/DLL/ClsSc_MouldRepairCheckBill.cs | 24
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 101 ++
WebAPI/ZPLTemplate/物料条码 80×60.zpl | 75 +
WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs | 243 ++++++
WebAPI/Service/JwtAuthorizeAttribute.cs | 28
WebAPI/Web.config | 8
Model/基础资料/基础资料/ClsPM_ProjectCommunicationBillMain_Model.cs | 26
WebAPI/Service/GeTuiService.cs | 15
WebAPI/Controllers/基础资料/基础资料/Cb_OtherOutBill_CostSubjectDetailController.cs | 4
DAL/生产管理/模具管理/ClsSb_MouldRepairWorkBill.cs | 35
WebAPI/Service/TokenAppendHandler.cs | 12
Model/基础资料/基础资料/ClsGy_SampleSchemeSub_Model.cs | 31
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 11
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 10
WebAPI/ZPLTemplate/物料条码 100×60.zpl | 65 +
WebAPI/Utility/JWTHelper.cs | 2
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 3
WebAPI/Controllers/WebAPIController.cs | 179 ++++
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
/dev/null | 0
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 8
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 8
DAL/DAL.csproj | 1
WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs | 787 ++++++++++++++++++++
WebAPI/Service/SignatureVerifyAttribute.cs | 31
WebAPI/WebAPI.csproj | 6
WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user | 52
36 files changed, 2,147 insertions(+), 102 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
deleted file mode 100644
index dee4588..0000000
--- a/BLL/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
deleted file mode 100644
index 0e18d6a..0000000
--- a/BLL/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
deleted file mode 100644
index c6a62d1..0000000
--- a/BLL/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
deleted file mode 100644
index fc52177..0000000
--- a/BLL/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
deleted file mode 100644
index dcd5847..0000000
--- a/BLL/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
deleted file mode 100644
index 3f6e20f..0000000
--- a/BLL/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
deleted file mode 100644
index 9868710..0000000
--- a/BLL/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
deleted file mode 100644
index 12606dc..0000000
--- a/BLL/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/BLL/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/BLL/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
deleted file mode 100644
index fa08c81..0000000
--- a/BLL/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
deleted file mode 100644
index 922a574..0000000
--- a/BLL/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/BLL/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/BLL/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 2b24fa2..77fe731 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -99,6 +99,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_ProductReceiveMaterialBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_SampleScheme_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Ctl.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsGy_SteppedPriceCoefficientBill .cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ItemMoneyBillMain .cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
deleted file mode 100644
index c6a62d1..0000000
--- a/DAL/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
deleted file mode 100644
index fc52177..0000000
--- a/DAL/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
deleted file mode 100644
index dcd5847..0000000
--- a/DAL/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
deleted file mode 100644
index 3f6e20f..0000000
--- a/DAL/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
deleted file mode 100644
index 9868710..0000000
--- a/DAL/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
deleted file mode 100644
index 12606dc..0000000
--- a/DAL/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/DAL/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/DAL/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
deleted file mode 100644
index fa08c81..0000000
--- a/DAL/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
deleted file mode 100644
index 922a574..0000000
--- a/DAL/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/DAL/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/DAL/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
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_SampleScheme_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_SampleScheme_Ctl.cs"
new file mode 100644
index 0000000..cd61afc
--- /dev/null
+++ "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_SampleScheme_Ctl.cs"
@@ -0,0 +1,154 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_SampleScheme_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_SampleScheme_Model oModel = new Model.ClsGy_SampleScheme_Model();
+ //public Model.ClsGy_SampleSchemeSub_Model osub = new Model.ClsGy_SampleSchemeSub_Model();
+ public List<Model.ClsGy_SampleSchemeSub_Model> DetailColl = new List<Model.ClsGy_SampleSchemeSub_Model>();
+
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ string sql = $@"INSERT INTO [Gy_SampleScheme] ([HName], [HShortNumber], [HParentID], [HLevel], [HEndFlag], [HStopflag], [HRemark], [HHelpCode], [HUseFlag], [HMakeTime], [HMakeEmp], [HCheckEmp], [HCheckTime], [HModifyEmp], [HModifyTime], [HStopEmp], [HStopTime], [HUSEORGID], [HCREATEORGID], [HInterID], [HSampleTimes], [HSampleType], [HSampleLevel], [HStrictLevel], [HAQL], [HEffectDate], [HExpireDate], [HIsSystemSet], [HERPItemID], [HNumber])
+ VALUES (
+ '{oModel.HName}', '{oModel.HShortNumber}', '{oModel.HParentID}', '{oModel.HLevel}', '{oModel.HEndFlag}', '{oModel.HStopflag}', '{oModel.HRemark}', '{oModel.HHelpCode}', '{oModel.HUseFlag}', '{oModel.HMakeTime}', '{oModel.HMakeEmp}', '{oModel.HCheckEmp}','{oModel.HCheckTime}','{oModel.HModifyEmp}', '{oModel.HModifyTime}', '{oModel.HStopEmp}','{oModel.HStopTime}','{oModel.HUSEORGID}','{oModel.HCREATEORGID}','{oModel.HInterID}','{oModel.HSampleTimes}','{oModel.HSampleType}','{oModel.HSampleLevel}','{oModel.HStrictLevel}','{oModel.HAQL}','{oModel.HEffectDate}','{oModel.HExpireDate}','{oModel.HIsSystemSet}','{0}','{oModel.HNumber}'
+ ); ";
+ oCn.RunProc(sql);
+
+
+ // 鎻掑叆瀛愯〃
+ if (DetailColl != null && DetailColl.Count > 0)
+ {
+ foreach (Model.ClsGy_SampleSchemeSub_Model osub in DetailColl)
+ {
+ if (osub == null)
+ continue;
+ string sql1 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{oModel.HInterID}', '{osub.HEntryID}', '{osub.HBatch}', '{osub.HSampleCode}', '{osub.HSampleRate}', '{osub.HExpression}', '{osub.HRejectQty}', '{osub.HAcceptQty}', '{osub.HSampleQty}', '{osub.HSampleLow}', '{osub.HSampleUp}''
+ ); ";
+ oCn.RunProc(sql1);
+ }
+ }
+
+
+
+ ////淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 lngBillKey)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID +
+ ",HLevel=" + oModel.HLevel +
+ ",HEndFlag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark='" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HUseFlag=" +oModel.HUseFlag +
+ ",HMakeTime='" + oModel.HMakeTime + "'" +
+ ",HMakeEmp='" + oModel.HMakeEmp + "'" +
+ ",HCheckEmp='" + oModel.HCheckEmp + "'" +
+ ",HCheckTime='" + oModel.HCheckTime + "'" +
+ ",HModifyEmp='" + oModel.HModifyEmp + "'" +
+ ",HModifyTime='" + oModel.HModifyTime + "'" +
+ ",HStopEmp='" + oModel.HStopEmp + "'" +
+ ",HStopTime='" + oModel.HStopTime + "'" +
+ ",HUSEORGID=" + oModel.HUSEORGID +
+ ",HCREATEORGID=" + oModel.HCREATEORGID +
+ ",HInterID=" + oModel.HInterID +
+ ",HSampleTimes=" + oModel.HSampleTimes +
+ ",HSampleType=" + oModel.HSampleType +
+ ",HSampleLevel=" + oModel.HSampleLevel +
+ ",HStrictLevel=" + oModel.HStrictLevel +
+ ",HAQL=" + oModel.HAQL +
+ ",HEffectDate='" + oModel.HEffectDate + "'" +
+ ",HExpireDate='" + oModel.HExpireDate + "'" +
+ ",HIsSystemSet=" + Convert.ToString(oModel.HIsSystemSet ? 1 : 0) +
+ ",HERPItemID=" + 0 +
+ ",HNumber='" + oModel.HNumber + "'" +
+ " Where HItemID=" + lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCn.RunProc("delete Gy_SampleSchemeSub where HInterID='" + oModel.HInterID + "'");
+
+
+ // 鎻掑叆瀛愯〃
+ if (DetailColl != null && DetailColl.Count > 0)
+ {
+ foreach (Model.ClsGy_SampleSchemeSub_Model osub in DetailColl)
+ {
+ if (osub == null)
+ continue;
+ string sql1 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{oModel.HInterID}', '{osub.HEntryID}', '{osub.HBatch}', '{osub.HSampleCode}', '{osub.HSampleRate}', '{osub.HExpression}', '{osub.HRejectQty}', '{osub.HAcceptQty}', '{osub.HSampleQty}', '{osub.HSampleLow}', '{osub.HSampleUp}''
+ ); ";
+ oCn.RunProc(sql1);
+ }
+ }
+
+
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_SampleScheme_Ctl()
+ {
+ MvarItemKey = "Gy_SampleScheme";
+ MvarReportTitle = "鎶芥牱鏂规璁剧疆";
+ oModel = new Model.ClsGy_SampleScheme_Model();
+ }
+ }
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
index 9b069a1..ca80d60 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
@@ -38,7 +38,21 @@
{
try
{
- //
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2,2 ", "h_p_Sc_MouldRepairWorkBill_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 Sc_MouldRepairWorkBillMain set " +
@@ -107,7 +121,24 @@
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
") ");
- }
+ }
+
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2,2 ", "h_p_Sc_MouldRepairWorkBill_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();
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
deleted file mode 100644
index dcd5847..0000000
--- a/DBUtility/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
deleted file mode 100644
index 3f6e20f..0000000
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
deleted file mode 100644
index fa08c81..0000000
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
deleted file mode 100644
index 922a574..0000000
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
deleted file mode 100644
index 84a963f..0000000
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
deleted file mode 100644
index c65df75..0000000
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
deleted file mode 100644
index 1d9a8a4..0000000
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
deleted file mode 100644
index fd5a993..0000000
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
deleted file mode 100644
index c8139ba..0000000
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
deleted file mode 100644
index 3bb77bc..0000000
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
deleted file mode 100644
index 6ec84c5..0000000
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
deleted file mode 100644
index ba76ed5..0000000
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
deleted file mode 100644
index dba98a7..0000000
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
deleted file mode 100644
index dcd5847..0000000
--- a/DBUtility/obj/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
deleted file mode 100644
index 3f6e20f..0000000
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 215bb0c..f17077b 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -119,6 +119,9 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_SampleSchemeSub_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_SampleScheme_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsPM_ProjectCommunicationBillMain_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_WorkShopICStockBillMain.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
deleted file mode 100644
index dcd5847..0000000
--- a/Model/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
deleted file mode 100644
index 3f6e20f..0000000
--- a/Model/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
deleted file mode 100644
index 9868710..0000000
--- a/Model/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
deleted file mode 100644
index 12606dc..0000000
--- a/Model/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/Model/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/Model/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
deleted file mode 100644
index fa08c81..0000000
--- a/Model/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
deleted file mode 100644
index 922a574..0000000
--- a/Model/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/Model/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/Model/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
deleted file mode 100644
index 635d36a..0000000
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
deleted file mode 100644
index 9868710..0000000
--- a/Model/obj/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
deleted file mode 100644
index 12606dc..0000000
--- a/Model/obj/Release/Model.pdb
+++ /dev/null
Binary files differ
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_SampleSchemeSub_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_SampleSchemeSub_Model.cs"
new file mode 100644
index 0000000..f6cf7ec
--- /dev/null
+++ "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_SampleSchemeSub_Model.cs"
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsGy_SampleSchemeSub_Model : DBUtility.ClsGy_Base_Model
+ {
+
+ public int HInterID;
+ public int HEntryID;
+ public int HBatch;
+ public string HSampleCode;
+ public string HSampleRate;
+ public string HExpression;
+ public int HRejectQty;
+ public int HAcceptQty;
+ public int HSampleQty;
+ public int HBaHSampleUptch;
+ public int HSampleLow;
+ public int HSampleUp;
+
+
+
+
+
+
+ }
+}
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_SampleScheme_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_SampleScheme_Model.cs"
new file mode 100644
index 0000000..0d7a8b4
--- /dev/null
+++ "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_SampleScheme_Model.cs"
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsGy_SampleScheme_Model : DBUtility.ClsGy_Base_Model
+ {
+ public int HInterID;
+ public int HSampleTimes;
+ public string HSampleType;
+ public string HSampleLevel;
+ public string HStrictLevel;
+ public string HAQL;
+ public string HEffectDate;
+ public bool HIsSystemSet;
+ public string HExpireDate;
+
+
+
+
+
+
+ }
+}
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/ClsPM_ProjectCommunicationBillMain_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/ClsPM_ProjectCommunicationBillMain_Model.cs"
new file mode 100644
index 0000000..99f1e7d
--- /dev/null
+++ "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/ClsPM_ProjectCommunicationBillMain_Model.cs"
@@ -0,0 +1,26 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsPM_ProjectCommunicationBillMain_Model :DBUtility.ClsXt_BaseBillMain
+ {
+ public int HProjectID { get; set; }
+ public string HProNumber { get; set; }
+ public string HProName { get; set; }
+ public int HCusID { get; set; }
+ public int HPMEmpID { get; set; }
+ public int HWorkEmpID { get; set; }
+ public int HReportEmpID { get; set; }
+ public string HProRisk { get; set; }
+ public string HProProgramme { get; set; }
+ public string HProSituation { get; set; }
+ public int HPrintQty { get; set; }
+
+
+
+ }
+}
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
deleted file mode 100644
index c0635b3..0000000
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
deleted file mode 100644
index ca3eca3..0000000
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
deleted file mode 100644
index fa08c81..0000000
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
deleted file mode 100644
index 922a574..0000000
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
deleted file mode 100644
index 48565f9..0000000
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 0f48c78..0000000
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
deleted file mode 100644
index 80be112..0000000
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
deleted file mode 100644
index 7cd568b..0000000
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
deleted file mode 100644
index f350917..0000000
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
deleted file mode 100644
index c0635b3..0000000
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
deleted file mode 100644
index ca3eca3..0000000
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..48caaab
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+f95e56b5f9755e3380309c272e92c6c4a10dd4c5
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index c96cdc8..abdfb7b 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -11,7 +11,6 @@
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
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
@@ -21,11 +20,19 @@
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
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
+<<<<<<< HEAD
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
>>>>>>> b96dd44760e07a20de9cd28f6daf0deccdf0705c
+=======
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index bfb772c..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index dd1ef6e..e00c9c5 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,5 +1,5 @@
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
deleted file mode 100644
index c0635b3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
deleted file mode 100644
index ca3eca3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index 4f43c6a..2d52a8a 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -31,12 +31,21 @@
defaults: new { id = RouteParameter.Optional }
);
// 娉ㄥ唽绛惧悕
+<<<<<<< HEAD
//config.Filters.Add(new SignatureVerifyAttribute());
//// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
//config.Filters.Add(new JwtAuthorizeAttribute());
//// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
//config.MessageHandlers.Add(new TokenAppendHandler());
+=======
+ // config.Filters.Add(new SignatureVerifyAttribute());
+ //// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
+ // config.Filters.Add(new JwtAuthorizeAttribute());
+
+ //// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
+ // config.MessageHandlers.Add(new TokenAppendHandler());
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
}
}
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 10cb7c5..9548076 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2739,7 +2739,7 @@
oCN.RunProc("Insert Into Gy_MouldFileMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HMouldNo,HName,HModel,HModel2,HDiameter" +
+ ",HMouldNo,HNumber,HName,HModel,HModel2,HDiameter" +
",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
@@ -2752,7 +2752,7 @@
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HMouldNo + "','" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
diff --git a/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs b/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs
new file mode 100644
index 0000000..50f57cd
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_SampleSchemeController.cs
@@ -0,0 +1,787 @@
+锘縰sing Model;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using Newtonsoft.Json;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using WebAPI.Service;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_SampleSchemeController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ /// <summary>
+ /// 鏌ヨ鏂规硶
+ /// </summary>
+ [Route("Gy_SampleScheme/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 " + sWhere , "h_v_Gy_GetSampleSchemeListView");
+
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ /// </summary>
+ [RequireSignature]
+ [Route("Gy_SampleScheme/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_SampleScheme_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsGy_SampleScheme_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_SampleScheme_Model>>(msg2);
+ List<ClsGy_SampleSchemeSub_Model> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_SampleSchemeSub_Model>>(msg3);
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ long HParentID = list[0].HParentID;
+ long HLevel = list[0].HLevel;
+ bool HEndFlag = list[0].HEndFlag;
+ bool HStopflag = list[0].HStopflag;
+ string HRemark = list[0].HRemark;
+ string HHelpCode = list[0].HHelpCode;
+ string HUseFlag = list[0].HUseFlag;
+ string HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = msg4;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
+ long HUnitID = list[0].HUnitID;
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ string _sql = "select HItemID from Gy_SampleScheme where HNumber = N'" + HNumber + "'";
+ DataSet _ds = oCN.RunProcReturn(_sql, "Gy_SampleScheme");
+ if (_ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触: 浠ｇ爜閲嶅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ string sql = $@"INSERT INTO [Gy_SampleScheme] ([HName], [HShortNumber], [HParentID], [HLevel], [HEndFlag], [HStopflag], [HRemark], [HHelpCode], [HUseFlag], [HMakeTime], [HMakeEmp], [HCheckEmp], [HCheckTime], [HModifyEmp], [HModifyTime], [HStopEmp], [HStopTime], [HUSEORGID], [HCREATEORGID], [HInterID], [HSampleTimes], [HSampleType], [HSampleLevel], [HStrictLevel], [HAQL], [HEffectDate], [HExpireDate], [HIsSystemSet], [HERPItemID], [HNumber])
+ VALUES (
+ '{list[0].HName}', '{list[0].HShortNumber}', '{list[0].HParentID}', '{list[0].HLevel}', '{list[0].HEndFlag}', '{list[0].HStopflag}', '{list[0].HRemark}', '{list[0].HHelpCode}', '{list[0].HUseFlag}', '{list[0].HMakeTime}', '{HMakeEmp}', '{list[0].HCheckEmp}','{list[0].HCheckTime}','{list[0].HModifyEmp}', '{list[0].HModifyTime}', '{list[0].HStopEmp}','{list[0].HStopTime}','{list[0].HUSEORGID}','{list[0].HCREATEORGID}','{list[0].HInterID}','{list[0].HSampleTimes}','{list[0].HSampleType}','{list[0].HSampleLevel}','{list[0].HStrictLevel}','{list[0].HAQL}','{list[0].HEffectDate}','{list[0].HExpireDate}','{list[0].HIsSystemSet}','{0}','{list[0].HNumber}'
+ ); ";
+ oCN.RunProc(sql);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_SampleScheme set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 鎵ц鏌ヨ鑾峰彇HItemID
+ DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_SampleScheme where HNumber = N'" + HNumber + "'", "Gy_SampleScheme");
+
+ if (temp_ds.Tables[0].Rows.Count < 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氭彃鍏ヤ富琛ㄦ暟鎹け璐�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ ClsGy_SampleSchemeSub_Model listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{itemID}', '{entryID}', '{listOne.HBatch}', '{listOne.HSampleCode}', '{listOne.HSampleRate}', '{listOne.HExpression}', '{listOne.HRejectQty}', '{listOne.HAcceptQty}', '{listOne.HSampleQty}', '{listOne.HSampleLow}', '{listOne.HSampleUp}'
+ ); ";
+ oCN.RunProc(sql3);
+ }
+
+
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氫繚瀛樺悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //涓昏〃
+ oCN.RunProc("Update Gy_SampleScheme" + " set " +
+ " HName='" + list[0].HName + "'" +
+ ",HShortNumber='" + list[0].HShortNumber + "'" +
+ ",HParentID=" + list[0].HParentID +
+ ",HLevel=" + list[0].HLevel +
+ ",HEndFlag=" + Convert.ToString(list[0].HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(list[0].HStopflag ? 1 : 0) +
+ ",HRemark='" + list[0].HRemark + "'" +
+ ",HHelpCode='" + list[0].HHelpCode + "'" +
+ ",HUseFlag='" + list[0].HUseFlag + "'" +
+ ",HMakeTime='" + list[0].HMakeTime + "'" +
+ ",HMakeEmp='" + HMakeEmp + "'" +
+ ",HCheckEmp='" + list[0].HCheckEmp + "'" +
+ ",HCheckTime='" + list[0].HCheckTime + "'" +
+ ",HModifyEmp='" + list[0].HModifyEmp + "'" +
+ ",HModifyTime='" + list[0].HModifyTime + "'" +
+ ",HStopEmp='" + list[0].HStopEmp + "'" +
+ ",HStopTime='" + list[0].HStopTime + "'" +
+ ",HUSEORGID=" + list[0].HUSEORGID +
+ ",HCREATEORGID=" + list[0].HCREATEORGID +
+ ",HInterID=" + list[0].HInterID +
+ ",HSampleTimes='" + list[0].HSampleTimes + "'" +
+ ",HSampleType='" + list[0].HSampleType + "'" +
+ ",HSampleLevel='" + list[0].HSampleLevel + "'" +
+ ",HStrictLevel='" + list[0].HStrictLevel +"'"+
+ ",HAQL=" + list[0].HAQL +
+ ",HEffectDate='" + list[0].HEffectDate + "'" +
+ ",HExpireDate='" + list[0].HExpireDate + "'" +
+ ",HIsSystemSet=" + Convert.ToString(list[0].HIsSystemSet ? 1 : 0) +
+ ",HERPItemID=" + 0 +
+ ",HNumber='" + list[0].HNumber + "'" +
+ " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_SampleScheme set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCN.RunProcReturn("delete from Gy_SampleSchemeSub where HInterID = " + HItemID, "Gy_SampleSchemeSub");
+
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ ClsGy_SampleSchemeSub_Model listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 = $@"INSERT INTO [Gy_SampleSchemeSub] ([HInterID], [HEntryID], [HBatch], [HSampleCode], [HSampleRate], [HExpression], [HRejectQty], [HAcceptQty], [HSampleQty], [HSampleLow], [HSampleUp]) VALUES(
+ '{HItemID}', '{entryID}', '{listOne.HBatch}', '{listOne.HSampleCode}', '{listOne.HSampleRate}', '{listOne.HExpression}', '{listOne.HRejectQty}', '{listOne.HAcceptQty}', '{listOne.HSampleQty}', '{listOne.HSampleLow}', '{listOne.HSampleUp}'
+ ); ";
+ oCN.RunProc(sql3);
+ }
+
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氫繚瀛樺悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鎸夐挳鏂规硶
+ /// </summary>
+ [Route("Gy_SampleScheme/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HInterID, "Gy_SampleScheme");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ瀛愯〃鏂规硶
+ /// </summary>
+ [Route("Gy_SampleScheme/listSub")]
+ [HttpGet]
+ public object listSub(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_SampleSchemeSub where 1 = 1 " + sWhere , "Gy_SampleSchemeSub");
+
+ //娣诲姞鍒楀悕
+ 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;
+ }
+
+
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_SampleScheme/deletesam")]
+ [HttpGet]
+ public object deletesam(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HItemID, "Gy_SampleScheme");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸茬粡瀹℃牳涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_SampleScheme Where HParentID='" + HItemID + "'", " Gy_SampleScheme");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("delete from Gy_SampleScheme where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_SampleSchemeSub where HInterID=" + HItemID);
+
+
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜锛氬垹闄ゅ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ #region 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_SampleScheme/AuditGy_SampleScheme")]
+ [HttpGet]
+ public object AuditGy_SampleScheme(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_SampleScheme_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_SampleScheme where HItemID=" + HInterID, "Gy_SampleScheme");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].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 (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_SampleScheme set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_SampleScheme_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_SampleScheme_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+
+ oCN.RunProc("update Gy_SampleScheme set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_SampleScheme_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_SampleScheme_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ 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/PM_ProjectCommunicationBillListController.cs b/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs
new file mode 100644
index 0000000..f0801b2
--- /dev/null
+++ b/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs
@@ -0,0 +1,243 @@
+锘縰sing Model;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using Newtonsoft.Json;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+
+namespace WebAPI.Controllers
+{
+ public class PM_ProjectCommunicationBillListController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ [Route("PM_ProjectCommunicationBillList/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_SampleScheme_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_PM_ProjectCommunicationBillMain where 1 = 1 " + sWhere, "h_v_PM_ProjectCommunicationBillMain");
+
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ }
+
+ [Route("PM_ProjectCommunicationBillList/getOriginalBill")]
+ [HttpGet]
+ public object getOriginalBill(string InterID, string EntryID)
+ {
+ try
+ {
+ DataSet ds;
+ string sql = $"select * from h_v_PM_ProjectBillList where HInterID ={InterID} and HEntryID={EntryID}";
+ ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectBillList");
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "fail锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "fail锛�" + e.ToString();
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+
+ [Route("PM_ProjectCommunicationBillList/Saver")]
+ [HttpPost]
+ public object Saver([FromBody] JObject oMain)
+ {
+ try
+ {
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string refSav = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_SampleScheme_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsPM_ProjectCommunicationBillMain_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsPM_ProjectCommunicationBillMain_Model>>(msg2);
+
+ string UserName = list[0].HMaker; //鍒跺崟浜�
+ list[0].HBillType = "4764";
+ list[0].HBillSubType = "4764";
+
+ //oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ list[0].HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ list[0].HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(list[0].HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (refSav == "1")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ string sql = $@"
+ INSERT INTO [PM_ProjectCommunicationBillMain] (
+ [HYear], [HPeriod], [HBillType], [HBillSubType], [HInterID], [HDate], [HBillNo],
+ [HBillStatus], [HCheckItemNowID], [HCheckItemNextID], [HCheckFlowID],
+ [HRemark], [HBacker], [HBackDate], [HBackRemark], [HChecker], [HCheckDate],
+ [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType],
+ [HDeleteMan], [HDeleteDate], [HMainSourceBillType], [HMainSourceInterID], [HMainSourceEntryID],
+ [HMainSourceBillNo], [HPrintQty], [HProjectID], [HProNumber], [HProName],
+ [HCusID], [HPMEmpID], [HWorkEmpID], [HProSituation], [HProRisk], [HProProgramme],
+ [HReportEmpID], [HOrgID]
+ )
+ VALUES ({DateTime.Now.Year}, {DateTime.Now.Month}, '{list[0].HBillType}', '{list[0].HBillSubType}', {list[0].HInterID}, '{list[0].HDate}', '{list[0].HBillNo}', 1, 0, 0, 0, '{list[0].HRemark ?? ""}', '{list[0].HBacker ?? ""}', '{(list[0].HBackDate)}', '{list[0].HBackRemark ?? ""}', '{list[0].HChecker ?? ""}', '{(list[0].HCheckDate)}', '{list[0].HMaker ?? ""}', '{(list[0].HMakeDate)}', '{list[0].HUpDater ?? ""}', '{(list[0].HUpDateDate)}', '{list[0].HCloseMan ?? ""}', '{(list[0].HCloseDate)}', '{list[0].HCloseType }', '{list[0].HDeleteMan ?? ""}', '{(list[0].HDeleteDate)}', '{list[0].HMainSourceBillType ?? ""}', '{list[0].HMainSourceInterID}', '{list[0].HMainSourceEntryID}', '{list[0].HMainSourceBillNo ?? ""}', '{list[0].HPrintQty}', {list[0].HProjectID }, '{list[0].HProNumber ?? ""}', '{list[0].HProName ?? ""}', {list[0].HCusID }, {list[0].HPMEmpID }, {list[0].HWorkEmpID }, '{list[0].HProSituation ?? ""}', '{list[0].HProRisk ?? ""}', '{list[0].HProProgramme ?? ""}', {list[0].HReportEmpID}, {100038} );";
+ oCN.RunProc(sql);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+
+ //==================================================================================
+
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update PM_ProjectCommunicationBillMain" + " set " +
+ " HProSituation='" + list[0].HProSituation + "'" +
+ ",HProRisk='" + list[0].HProRisk + "'" +
+ ",HProProgramme='" + list[0].HProProgramme + "'" +
+ ",HReportEmpID=" + list[0].HReportEmpID +
+ " Where HInterID=" + list[0].HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ [Route("PM_ProjectCommunicationBillList/getBill")]
+ [HttpGet]
+ public object getBill(string InterID)
+ {
+ try
+ {
+ DataSet ds;
+ string sql = $"select * from h_v_PM_ProjectCommunicationBillMain where HInterID ={InterID}";
+ ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectCommunicationBillMain");
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "fail锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "fail锛�" + e.ToString();
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 361c1bc..06325f4 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -5103,6 +5103,7 @@
oItem.HBillType = "3807";
oItem.HBillSubType = "3807";
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
@@ -5580,7 +5581,6 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -5592,7 +5592,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 9e1452f..0bba5be 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20,6 +20,7 @@
using WebAPI.Models;
using WebAPI.Service;
using SyntacticSugar.constant;
+using System.Text.RegularExpressions;
namespace WebAPI.Controllers
{
@@ -24005,6 +24006,7 @@
}
#endregion
+ #region APP鐧诲綍鏉冮檺楠岃瘉鎺ュ彛
/// <summary>
/// APP鐧诲綍鏉冮檺楠岃瘉鎺ュ彛
/// </summary>
@@ -24080,5 +24082,182 @@
return objJsonResult;
}
}
+ #endregion
+
+ #region 钃濈墮鎵撳嵃鏈鸿幏鍙栨墦鍗版ā鏉�
+ public class PrintRequestDto
+ {
+ public string ptMode { get; set; }
+ public string templateName { get; set; }
+ public JArray msg { get; set; } // 浣犵殑鎵归噺鏁版嵁
+ }
+ /// <summary>
+ /// ptMode: 鎵撳嵃妯″紡锛屽嵆闇�瑕侀偅绉嶆墦鍗版寚浠わ紝CPCL,TSPL,ESC,ZPL 涓�夋嫨
+ /// templateName: 妯℃澘鍚嶏紝鏍规嵁妯℃澘鍘绘寚瀹氱洰褰曚笅鏍规嵁鍚庣紑鎵炬枃浠�
+ /// msg: 鎵撳嵃鍐呭
+ /// </summary>
+ /// <param name="ptMode"></param>
+ /// <param name="templateName"></param>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("WebAPI/getBLEPrintTemplate")]
+ [HttpPost]
+ public object getBLEPrintTemplate([FromBody] PrintRequestDto dto)
+ {
+ var ptMode = dto.ptMode;
+ var templateName = dto.templateName;
+ var msg = dto.msg;
+ if (string.IsNullOrWhiteSpace(ptMode))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈�夋嫨鎵撳嵃妯″紡锛屾棤娉曠敓鎴愭墦鍗版ā鏉�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (string.IsNullOrWhiteSpace(templateName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈�夋嫨鎵撳嵃妯℃澘锛屾棤娉曠敓鎴愭墦鍗版ā鏉�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string suffix = ".txt";
+ string folder = "ptTemplate";
+ // 鍖归厤 {{ 瀛楁鍚� }} 鎵�闇�姝ｅ垯琛ㄨ揪寮� 鏀寔涓枃
+ var regex = new Regex(@"{{\s*([\u4e00-\u9fa5a-zA-Z0-9_\s]+?)\s*}}", RegexOptions.Compiled);
+
+ if (ptMode == "ZPL")
+ {
+ suffix = ".zpl";
+ folder = "ZPLTemplate";
+ }
+
+ try
+ {
+ // 璇诲彇妯℃澘鏂囦欢
+ string rootPath = System.Web.HttpContext.Current.Server.MapPath("~/");
+ string templateDir = Path.Combine(rootPath, folder);
+ string templateFile = Path.Combine(templateDir, templateName+suffix);
+
+ // 濡傛灉鐩綍涓嶅瓨鍦�
+ if (!Directory.Exists(templateDir))
+ {
+ Directory.CreateDirectory(templateDir);
+ }
+
+ // 濡傛灉鏂囦欢涓嶅瓨鍦�
+ if (!File.Exists(templateFile))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.Message = $"妯℃澘鏂囦欢涓嶅瓨鍦細{templateFile}";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 璇诲彇妯℃澘锛圲TF8 鏀寔涓枃锛�
+ string templateContent = File.ReadAllText(templateFile, Encoding.UTF8);
+
+ // 閫愯璇诲彇妯℃澘鏂囦欢
+ var lines = templateContent.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+ var sb = new StringBuilder();
+
+ foreach(JToken JOneKVP in msg)
+ {
+ if(JOneKVP is JObject item)
+ {
+ foreach (var line in lines)
+ {
+ string currentLine = line;
+
+ // 璺宠繃娉ㄩ噴琛� //
+ if (currentLine.TrimStart().StartsWith("//"))
+ {
+ continue;
+ }
+
+ // 姝ｅ垯琛ㄨ揪寮忓尮閰� {{ 瀛楁鍚� }} 鎵�鍦ㄨ鐨勫瓧娈碉紝濡傛灉鏈夛紝鍒欒繘琛屾浛鎹紝娌℃湁锛屽垯榛樿涓虹┖瀛楃涓�
+ currentLine = regex.Replace(currentLine, match =>
+ {
+ string fieldName = match.Groups[1].Value.Trim();
+ if (msg != null && item.ContainsKey(fieldName))
+ {
+ return item[fieldName]?.ToString() ?? "";
+ }
+ return "";
+ });
+ // 灏嗘墍鏈� \n 鐨勬崲琛岀 鏇挎崲涓� \r\n
+
+ sb.Append(currentLine);
+ sb.Append("\r\n"); // 鏍囧噯鎹㈣
+ }
+ }
+ }
+
+
+ string result = sb.ToString().TrimEnd();
+ // 杩斿洖娓叉煋鍚庣殑鎵撳嵃鎸囦护
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = $"妯℃澘娓叉煋鎴愬姛";
+ objJsonResult.data = result;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"妯℃澘娓叉煋澶辫触锛歿ex.Message}";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ [HttpGet]
+ [Route("Web/getSysParameter")]
+ public object getSysParameter(string HClientID)
+ {
+ var HValue = oSystemParameter.GetSingleSystemParameter("uni-app_savelogin", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (HValue == "3" && HClientID != null)
+ {
+ DataSet ds = oCN.RunProcReturn("select * from Gy_UserClientIdRelation where HClientID= '" + HClientID + "'", "Gy_UserClientIdRelation");
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏍规嵁璁惧鑷姩鐧诲綍";
+ objJsonResult.data = HValue;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绯荤粺鍙傛暟涓嶅瓨鍦紝璇疯仈绯荤鐞�";
+ objJsonResult.data = 0;
+ return objJsonResult;
+ }
+
+ }
+ else if (HValue == "2" || HValue == "1")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = HValue;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绯荤粺鍙傛暟涓嶅瓨鍦紝璇疯仈绯荤鐞�";
+ objJsonResult.data = 0;
+ return objJsonResult;
+ }
+ }
}
}
+#endregion
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index f0a1db3..45b2881 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -263,6 +263,11 @@
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
+ case "鍙楁墭鍔犲伐鏉愭枡鏀舵枡鍗�":
+ tabname = "h_v_IF_InceptEntPOInStockBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_InceptEntPOInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_InceptEntPOInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
default:
break;
}
@@ -595,6 +600,11 @@
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
+ case "1130": //鍙楁墭鍔犲伐鏉愭枡鏀舵枡鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_InceptEntPOInStockBillList_Source where 鍙敓鎴愭潯鐮佹暟閲� > 0 and hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_InceptEntPOInStockBillList_Source");
+ ListRows.Add(HSourceOrderList2(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
default:
break;
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 1a8dee0..6201329 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -1558,13 +1558,13 @@
//SN鐮佽拷婧�
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
[HttpGet]
- public object Get_QC_FiveMenOneRingList(string SN, string user)
+ public object Get_QC_FiveMenOneRingList(string SN, string ISBackWork, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "'", "h_p_QC_FiveMenOneRingList");
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "','"+ ISBackWork + "'", "h_p_QC_FiveMenOneRingList");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1683,13 +1683,13 @@
//鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹�
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
[HttpGet]
- public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs, string user)
+ public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs,string ISBackWork, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "','"+ ISBackWork + "'", "h_p_QC_FiveMenOneRingList_Query");
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
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/Cb_OtherOutBill_CostSubjectDetailController.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/Cb_OtherOutBill_CostSubjectDetailController.cs"
index af66470..c9872b0 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/Cb_OtherOutBill_CostSubjectDetailController.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/Cb_OtherOutBill_CostSubjectDetailController.cs"
@@ -32,7 +32,7 @@
{
List<object> columnNameList = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_Query", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Cb_OtherOutBill_CostSubjectDetail_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -371,7 +371,7 @@
try
{
//鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_CostAverageType_Drop", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Cb_OtherOutBill_CostSubjectDetail_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
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 1760065..6f1d5d5 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"
@@ -17,6 +17,7 @@
using WebAPI.Models;
using WebAPI.Service;
using WebAPI.Utility;
+using Kingdee.BOS.WebApi.Client;
namespace WebAPI.Controllers
{
@@ -2600,7 +2601,7 @@
{
//sCloudMode锛氱郴缁熷弬鏁� 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)锛�
//sERPMode锛氱郴缁熷弬鏁� 搴撳瓨鎺у埗-WMS搴撳瓨鎺у埗ERP妯″紡 (WISE銆丆LOUD銆丮ES)锛�
- //sHType锛氬�� 1 瀵瑰簲缂撳瓨鍒楄〃鍒犻櫎锛涘�� 2 瀵瑰簲宸蹭笂浼犳挙閿�锛�
+ //sHType锛氬�� 1 瀵瑰簲缂撳瓨鍒楄〃鍒犻櫎锛涘�� 2 瀵瑰簲宸蹭笂浼犳挙閿�锛涘�� 3 瀵瑰簲鏍￠獙妯″潡宸蹭笂浼犳挙閿�锛�
//鍏湁浜戞ā寮�
if (sCloudMode == "N")
@@ -2738,7 +2739,7 @@
var sJson = new
{
FormId = sFormId,
- FieldKeys = "FBillNo",
+ FieldKeys = "FBillNo,FAPPROVERID",
FilterString = $@"FBillNo='{HBillNo}'",
OrderString = "",
TopRowCount = 0,
@@ -2770,7 +2771,7 @@
}
}
//sHType = 2瀵瑰簲宸蹭笂浼犳挙閿�
- else
+ else if(sHType == 2)
{
//鍒ゆ柇杩斿洖鐨勬暟缁勬暟鎹腑鏄惁瀛樺湪"false"锛屽瓨鍦ㄤ唬琛ㄩ�掑叆鐨勪笟鍔″璞¤〃鍗旾d涓嶆纭�
if (_saveObj[0][0].ToString().Contains("false") == true)
@@ -2784,26 +2785,73 @@
return false;
}
}
+ //sHType = 3瀵瑰簲鏍￠獙妯″潡宸蹭笂浼犳挙閿�
+ else if (sHType == 3)
+ {
+ //鍒ゆ柇杩斿洖鐨勬暟缁勬暟鎹腑鏄惁瀛樺湪"false"锛屽瓨鍦ㄤ唬琛ㄩ�掑叆鐨勪笟鍔″璞¤〃鍗旾d涓嶆纭�
+ if (_saveObj[0][0].ToString().Contains("false") == true)
+ {
+ sErrMsg = "姝ゆā鍧楁殏涓嶆敮鎸佹挙閿�鍔熻兘锛�";
+ return false;
+ }
+ else if (_saveObj[0][1].ToString() != "0")
+ {
+ sErrMsg = "鏍￠獙鎾ら攢鍗曟嵁澶辫触锛屽崟鎹彿锛�" + HBillNo + "锛岄噾铦朵簯閲屽凡瀹℃牳锛屼笉鍏佽鎾ら攢锛�";
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ else
+ {
+ sErrMsg = "sHType鍊奸�掑叆閿欒锛�";
+ return false;
+ }
}
}
}
//绉佹湁浜戞ā寮�
else
{
- ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //sHType = 3 鎵爜鏍￠獙妯″潡
+ if (sHType == 3)
{
- sErrMsg = "鍗曟嵁鏌ヨ鍙戠敓閿欒锛�";
- return false;
+ ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery_BillCheck " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'", "h_p_WMS_BillQuery_BillCheck");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鍗曟嵁鏌ヨ鍙戠敓閿欒锛�";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ else
+ {
+ return true;
+ }
}
- else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
- {
- sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- return false;
- }
+ //sHType = 1 鎴� sHType = 2 鎵爜鏂板妯″潡
else
{
- return true;
+ ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鍗曟嵁鏌ヨ鍙戠敓閿欒锛�";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ else
+ {
+ return true;
+ }
}
}
}
@@ -9456,6 +9504,16 @@
}
#endregion
+ //鎾ら攢鍓嶅垽鏂噾铦朵簯涓崟鎹槸鍚﹀瓨鍦�
+ if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, sERPMode, 3, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
try
{
oCn.BeginTran();
@@ -15521,5 +15579,183 @@
#endregion
#endregion
+
+ #region 璋冪敤閲戣澏webapi鎺ュ彛鍚屾鍩虹璧勬枡鏂规硶
+
+ #region 鐗╂枡鍩虹璧勬枡鍚屾
+ [Route("WEBSController/MaterialDataToLocalByKDWebApi")]
+ [HttpGet]
+ public object MaterialDataToLocalByKDWebApi(string HDate)
+ {
+ try
+ {
+ //璁块棶閲戣澏
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ string HReturn;
+
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾鍩虹璧勬枡澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //璋冪敤鍗曟嵁鏌ヨwebapi
+ string sJson = $"{{\"FormId\":\"BD_MATERIAL\",\"FieldKeys\":\"FMATERIALID,FNumber,FName,FSpecification,FApproveDate,FCreateDate,FDocumentStatus\",\"FilterString\":\"FApproveDate >= '2025-04-01T00:00:00' AND FApproveDate <= '2025-04-30T23:59:59'\",\"Limit\":100,\"StartRow\":0,\"TopRowCount\":0}}";
+
+ var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc", new object[] { "BD_MATERIAL", sJson });
+
+ var _saveObj = JObject.Parse(result);
+
+ //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
+ if (_saveObj.SelectToken("Result.ResponseStatus.IsSuccess")?.ToString().ToUpper() != "TRUE")
+ {
+ HReturn = result.ToString();
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏌ヨ鐗╂枡淇℃伅澶辫触锛�" + strErrorMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //涓昏〃鏁版嵁璧嬪��
+ var MainData = new
+ {
+ HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HDate = _saveObj.SelectToken("Result.Result.Date")?.ToString(),
+ HBillNo = _saveObj.SelectToken("Result.Result.BillNo")?.ToString() ?? "",
+ HBillStatus = _saveObj.SelectToken("Result.Result.ApproverId_Id")?.ToString() == "0" ? 1 : 2,
+ HPURCHASERNumber = _saveObj.SelectToken("Result.Result.PurchaserId.Number")?.ToString() ?? "",
+ HMaker = _saveObj.SelectToken("Result.Result.CreatorId.Name")?.ToString() ?? "",
+ HChecker = _saveObj.SelectToken("Result.Result.ApproverId.Name")?.ToString() ?? "",
+ HUpDater = _saveObj.SelectToken("Result.Result.ModifierId.Name")?.ToString() ?? "",
+ HDeleteMan = _saveObj.SelectToken("Result.Result.CancellerId.Name")?.ToString() ?? "",
+ HCloseMan = _saveObj.SelectToken("Result.Result.CloserId.Name")?.ToString() ?? "",
+ HPURCHASERGROUPNumber = _saveObj.SelectToken("Result.Result.PurchaserGroupId.Number")?.ToString() ?? "",
+ HPROVIDERCONTACTNumber = _saveObj.SelectToken("Result.Result.ProviderContactId.CONTACTNUMBER")?.ToString() ?? "",
+ HSETTLEMODEID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleModeId_Id")?.ToString() ?? "0",
+ HSETTLEMODENumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleModeId.Number")?.ToString() ?? "",
+ HSETTLECURRID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleCurrId_Id")?.ToString() ?? "0",
+ HSETTLECURRNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleCurrId.Number")?.ToString() ?? "",
+ HEXCHANGETYPEID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeTypeId_Id")?.ToString() ?? "0",
+ HEXCHANGETYPENumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeTypeId.Number")?.ToString() ?? "",
+ HPAYCONDITIONID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].PayConditionId_Id")?.ToString() ?? "0",
+ HPAYCONDITIONNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].PayConditionId.Number")?.ToString() ?? "",
+ HEXCHANGERATE = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeRate")?.ToString() ?? "0",
+ HLOCALCURRID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].LocalCurrId_Id")?.ToString() ?? "0",
+ HLOCALCURRNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].LocalCurrId.Number")?.ToString() ?? "",
+ HISINCLUDEDTAX = _saveObj.SelectToken("Result.Result.POOrderFinance[0].IsIncludedTax")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
+ HISPRICEEXCLUDETAX = _saveObj.SelectToken("Result.Result.POOrderFinance[0].FISPRICEEXCLUDETAX")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
+ };
+
+ //鏍规嵁鍗曟嵁鍙枫�佸崟鎹甀D锛屽垹闄ゆ湰鍦版暟鎹�
+ oCn.RunProc("Delete from Cg_POOrderBillMain where HBillNo='" + MainData.HBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from Cg_POOrderBillMain where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from Cg_POOrderBillSub where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //瀛愯〃鏁版嵁璧嬪��
+ var dataArr = _saveObj.SelectToken("Result.Result.POOrderEntry") as JArray;
+
+ if (dataArr != null)
+ {
+ foreach (var oSub in dataArr)
+ {
+ var SubData = new
+ {
+ HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
+ HMaterID = oSub.SelectToken("MaterialId_Id")?.ToString() ?? "0",
+ HUnitID = oSub.SelectToken("UnitId_Id")?.ToString() ?? "0",
+ HQty = oSub.SelectToken("Qty")?.ToString() ?? "0",
+ HPrice = oSub.SelectToken("Price")?.ToString() ?? "0",
+ HTaxPrice = oSub.SelectToken("TaxPrice")?.ToString() ?? "0",
+ HDiscountRate = oSub.SelectToken("DiscountRate")?.ToString() ?? "0",
+ HMoney = oSub.SelectToken("Amount")?.ToString() ?? "0",
+ HTaxRate = oSub.SelectToken("TaxRate")?.ToString() ?? "0",
+ HTaxMoney = oSub.SelectToken("TaxAmount")?.ToString() ?? "0",
+ HDate = oSub.SelectToken("DeliveryDate")?.ToString() ?? "",
+ HRemark = oSub.SelectToken("Note")?.ToString() ?? "",
+ HRelationQty = oSub.SelectToken("JOINQTY")?.ToString() ?? "0",
+ HBackRelationQty = oSub.SelectToken("STOCKRETQTY")?.ToString() ?? "0",
+ HPropertyID = oSub.SelectToken("AuxPropId_Id")?.ToString() ?? "0",
+ HBatChNo = oSub.SelectToken("FLot_Text")?.ToString() ?? "",
+ HAuxPropID = oSub.SelectToken("AuxPropId_Id")?.ToString() ?? "0",
+ HMTONo = oSub.SelectToken("MtoNo")?.ToString() ?? "",
+ HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HERPEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
+ HSEQ = oSub.SelectToken("Seq")?.ToString() ?? "0",
+ HRECEIVEDEPTID = oSub.SelectToken("ReceiveDeptId_Id")?.ToString() ?? "0",
+ HSUPPLIERLOT = oSub.SelectToken("SupplierLot")?.ToString() ?? "",
+ HBOMID = oSub.SelectToken("BomId_Id")?.ToString() ?? "0",
+ HBomNumber = oSub.SelectToken("BomId.Number")?.ToString() ?? "",
+ HSTOCKUNITID = oSub.SelectToken("StockUnitID_Id")?.ToString() ?? "0",
+ HBASEUNITID = oSub.SelectToken("BaseUnitId_Id")?.ToString() ?? "0",
+ HBFLOWID = oSub.SelectToken("FBFLowId_Id")?.ToString() ?? "",
+ HGIVEAWAY = oSub.SelectToken("GiveAway")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
+ HROWTYPE = oSub.SelectToken("RowType")?.ToString() ?? "",
+ HBASEUNITQTY = oSub.SelectToken("BaseUnitQty")?.ToString() ?? "0",
+ HSTOCKBASEQTY = oSub.SelectToken("StockBaseQty")?.ToString() ?? "0",
+ HREQTRACENO = oSub.SelectToken("ReqTraceNo")?.ToString() ?? "",
+ HMATERIALDESC = oSub.SelectToken("MaterialDesc[0].Value")?.ToString() ?? "",
+ HRECEIVEORGID = oSub.SelectToken("ReceiveOrgId_Id")?.ToString() ?? "0",
+ HREQUIREORGID = oSub.SelectToken("RequireOrgId_Id")?.ToString() ?? "0",
+ HTAXNETPRICE = oSub.SelectToken("TaxNetPrice")?.ToString() ?? "0",
+ HPRICECOEFFICIENT = oSub.SelectToken("PriceCoefficient")?.ToString() ?? "0",
+ HTAXCOMBINATION = oSub.SelectToken("FTaxCombination_Id")?.ToString() ?? "0",
+ HTAXCOMBINATIONNumber = oSub.SelectToken("FTaxCombination.Number")?.ToString() ?? "",
+ HPRICEUNITID = oSub.SelectToken("PriceUnitId_Id")?.ToString() ?? "0",
+ HPRICELISTENTRY = oSub.SelectToken("PriceListEntry_Id")?.ToString() ?? "0",
+ HPRICELISTENTRYNumber = oSub.SelectToken("PriceListEntry.Number")?.ToString() ?? "",
+ HPAYORGID = oSub.SelectToken("PayOrgId_Id")?.ToString() ?? "0",
+ HSETTLEORGID = oSub.SelectToken("SettleOrgId_Id")?.ToString() ?? "0",
+ HTaxRate_TAX = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRate")?.ToString() ?? "0",
+ HTaxMoney_TAX = oSub.SelectToken("POORDERENTRY_TAX[0].TaxAmount")?.ToString() ?? "0",
+ HTAXRATEID = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRateId_Id")?.ToString() ?? "0",
+ HTAXRATENumber = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRateId.Number")?.ToString() ?? "",
+ HCOSTPERCENT = oSub.SelectToken("POORDERENTRY_TAX[0].CostPercent")?.ToString() ?? "0",
+ HCOSTAMOUNT = oSub.SelectToken("POORDERENTRY_TAX[0].CostAmount")?.ToString() ?? "0",
+ HVAT = oSub.SelectToken("POORDERENTRY_TAX[0].VAT")?.ToString() ?? "",
+ HSELLERWITHHOLDING = oSub.SelectToken("POORDERENTRY_TAX[0].SellerWithholding")?.ToString() ?? "",
+ HBUYERWITHHOLDING = oSub.SelectToken("POORDERENTRY_TAX[0].BuyerWithholding")?.ToString() ?? "",
+ };
+
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏌ヨ鐗╂枡淇℃伅鍙戠敓寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
index 7b6350d..6e460a0 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
@@ -408,5 +408,106 @@
}
}
#endregion
+
+
+ #region 璁惧浜ч噺 鑾峰彇璁惧閲囬泦浜ч噺鏈�澶�
+
+ [Route("Sc_HEquipStateDistribution/Get_EquipOutputHQty")]
+ [HttpGet]
+ public object Get_EquipOutputHQty(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = @"SELECT b.HItemID HSourceID,c.HInterID HEquipID, a.HSourceCode 璁惧鍚嶇О,SUM(CASE WHEN HTechParamName = '浜ч噺' THEN TRY_CAST(HResult AS DECIMAL(18,2)) ELSE 0 END) AS 浜ч噺,
+ MAX(CASE WHEN HTechParamName = '杩愯鏃堕暱' THEN TRY_CAST(HResult AS DECIMAL(18, 2)) ELSE NULL END) AS 杩愯鏃堕暱
+ FROM Sb_EquipMentCollectionTechParam_Temp a with(nolock)
+ left join Gy_Source b on a.HSourceCode=b.HMacAddr
+ left join Gy_EquipFileBillMain c on b.HItemID=c.HSourceID
+ WHERE HTechParamName IN('浜ч噺', '杩愯鏃堕暱') " + sWhere+ " GROUP BY a.HSourceCode,b.HItemID,c.HInterID";
+
+ ds = oCN.RunProcReturn(sql, "Sb_EquipMentCollectionTechParam_Temp");
+
+ //娣诲姞鍒楀悕
+ 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_HEquipStateDistribution/Get_EquipOutputHQty_Detail")]
+ [HttpGet]
+ public object Get_EquipOutputHQty_Detail(int HEquipID, string HDate)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParam_TempHQty_Deltail '" + HEquipID + "','" + HDate + "'", "h_p_Sb_EquipMentCollectionTechParam_TempHQty_Deltail");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠璁惧鏌ユ棤璇︽儏鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ // 閬嶅巻鎵�鏈夎〃
+ foreach (DataTable table in ds.Tables)
+ {
+ List<object> tableColumnList = new List<object>();
+
+ // 娣诲姞鍒楀悕
+ foreach (DataColumn col in table.Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
+ }
+
+ // 灏嗘瘡涓〃鐨勫垪鍚嶅垪琛ㄦ坊鍔犲埌鎬诲垪鍚嶅垪琛�
+ columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ 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/DLL/ClsSc_MouldRepairCheckBill.cs b/WebAPI/DLL/ClsSc_MouldRepairCheckBill.cs
index 5d769a1..244e934 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairCheckBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairCheckBill.cs
@@ -63,16 +63,7 @@
",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
- ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
-
- //",HDeptID=" + omodel.HDeptID.ToString() +
- //",HDeptNumber='" + omodel.HDeptNumber +"'"+
- //",HEmpID=" + omodel.HEmpID.ToString() +
- //",HEmpNumber='" + omodel.HEmpNumber +"'"+
- //",HGroupID=" + omodel.HGroupID.ToString() +
- //",HWHID=" + omodel.HWHID.ToString() +
- //",HSCWHID=" + omodel.HSCWHID.ToString() +
-
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -94,18 +85,7 @@
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
") ");
}
- //
- //foreach (Model.ClsSc_MouldRepairCheckBillSub oSub in DetailColl)
- //{
- // Ds = oCn.RunProcReturn("exec h_p_Sc_MouldRepairCheckBill_Qty " + oSub.HICMOInterID, "");
- // if (Ds.Tables[0].Rows.Count == 0)
- // return;
- // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
- // {
- // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
- // return false;
- // }
- //}
+
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
diff --git a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
index d755689..eb058c5 100644
--- a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-04-27T02:18:33.7985393Z;True|2026-04-27T10:08:12.8438152+08:00;True|2026-04-27T09:59:55.6118412+08:00;False|2026-04-27T09:58:35.5433131+08:00;True|2026-04-22T13:46:35.7999639+08:00;True|2026-04-22T13:37:33.3595562+08:00;False|2026-04-22T13:36:44.6163941+08:00;True|2026-04-20T17:23:12.3696160+08:00;True|2026-04-20T17:11:49.7671685+08:00;True|2026-04-20T17:01:26.9990531+08:00;True|2026-04-20T16:54:12.4433947+08:00;True|2026-04-20T16:46:57.6462699+08:00;True|2026-04-20T16:42:57.8307232+08:00;True|2026-04-20T16:28:39.7476167+08:00;True|2026-04-20T16:21:44.4281083+08:00;True|2026-04-20T15:54:54.0650372+08:00;False|2026-04-20T15:53:16.9752154+08:00;True|2026-04-20T09:38:00.7302296+08:00;False|2026-04-20T09:35:50.0193777+08:00;True|2026-04-16T13:47:52.4189071+08:00;True|2026-04-16T12:55:27.8047391+08:00;True|2026-04-15T15:25:13.5585076+08:00;True|2026-04-15T15:18:40.0113998+08:00;True|2026-04-15T13:40:25.2393656+08:00;False|2026-04-15T13:39:38.6236889+08:00;True|2026-04-14T14:31:30.6734754+08:00;False|2026-04-14T14:30:41.4516757+08:00;True|2026-04-13T16:44:08.4642937+08:00;True|2026-04-13T16:36:02.3077110+08:00;True|2026-04-13T14:59:21.0103174+08:00;True|2026-04-13T14:39:45.1257225+08:00;True|2026-04-13T14:33:54.7926295+08:00;True|2026-04-13T14:28:29.8919092+08:00;True|2026-04-13T14:23:44.7319904+08:00;True|2026-04-13T14:19:18.5894161+08:00;True|2026-04-13T14:13:07.6590290+08:00;True|2026-04-13T14:08:38.6545470+08:00;True|2026-04-13T13:42:48.7331271+08:00;True|2026-04-13T13:28:28.6092259+08:00;True|2026-04-13T13:22:20.9710518+08:00;False|2026-04-13T13:21:10.4412531+08:00;True|2026-04-10T12:36:37.6936108+08:00;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
+ <History>True|2026-04-29T08:47:04.9171448Z;True|2026-04-29T16:25:33.4958449+08:00;True|2026-04-29T15:34:29.5741739+08:00;True|2026-04-29T14:10:33.3160064+08:00;True|2026-04-29T14:06:31.3760141+08:00;False|2026-04-29T14:05:58.0158818+08:00;True|2026-04-29T10:25:30.7181581+08:00;True|2026-04-29T10:24:32.8331581+08:00;False|2026-04-29T10:23:37.9949570+08:00;True|2026-04-28T11:12:41.1993974+08:00;True|2026-04-28T10:59:28.3932572+08:00;True|2026-04-28T10:46:16.5971815+08:00;True|2026-04-28T09:38:04.9793088+08:00;False|2026-04-28T09:37:19.4255018+08:00;True|2026-04-27T15:09:44.0897608+08:00;True|2026-04-27T14:54:06.6458560+08:00;True|2026-04-27T14:44:18.2209820+08:00;True|2026-04-27T14:13:14.4765480+08:00;True|2026-04-27T14:04:25.5419561+08:00;True|2026-04-27T13:49:53.0044534+08:00;True|2026-04-27T13:16:28.0509184+08:00;True|2026-04-27T13:06:51.0405801+08:00;True|2026-04-27T12:49:54.6907285+08:00;True|2026-04-27T10:18:33.7985393+08:00;True|2026-04-27T10:08:12.8438152+08:00;True|2026-04-27T09:59:55.6118412+08:00;False|2026-04-27T09:58:35.5433131+08:00;True|2026-04-22T13:46:35.7999639+08:00;True|2026-04-22T13:37:33.3595562+08:00;False|2026-04-22T13:36:44.6163941+08:00;True|2026-04-20T17:23:12.3696160+08:00;True|2026-04-20T17:11:49.7671685+08:00;True|2026-04-20T17:01:26.9990531+08:00;True|2026-04-20T16:54:12.4433947+08:00;True|2026-04-20T16:46:57.6462699+08:00;True|2026-04-20T16:42:57.8307232+08:00;True|2026-04-20T16:28:39.7476167+08:00;True|2026-04-20T16:21:44.4281083+08:00;True|2026-04-20T15:54:54.0650372+08:00;False|2026-04-20T15:53:16.9752154+08:00;True|2026-04-20T09:38:00.7302296+08:00;False|2026-04-20T09:35:50.0193777+08:00;True|2026-04-16T13:47:52.4189071+08:00;True|2026-04-16T12:55:27.8047391+08:00;True|2026-04-15T15:25:13.5585076+08:00;True|2026-04-15T15:18:40.0113998+08:00;True|2026-04-15T13:40:25.2393656+08:00;False|2026-04-15T13:39:38.6236889+08:00;True|2026-04-14T14:31:30.6734754+08:00;False|2026-04-14T14:30:41.4516757+08:00;True|2026-04-13T16:44:08.4642937+08:00;True|2026-04-13T16:36:02.3077110+08:00;True|2026-04-13T14:59:21.0103174+08:00;True|2026-04-13T14:39:45.1257225+08:00;True|2026-04-13T14:33:54.7926295+08:00;True|2026-04-13T14:28:29.8919092+08:00;True|2026-04-13T14:23:44.7319904+08:00;True|2026-04-13T14:19:18.5894161+08:00;True|2026-04-13T14:13:07.6590290+08:00;True|2026-04-13T14:08:38.6545470+08:00;True|2026-04-13T13:42:48.7331271+08:00;True|2026-04-13T13:28:28.6092259+08:00;True|2026-04-13T13:22:20.9710518+08:00;False|2026-04-13T13:21:10.4412531+08:00;True|2026-04-10T12:36:37.6936108+08:00;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+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>04/27/2026 09:59:06</publishTime>
+ <publishTime>04/29/2026 16:46:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/27/2026 09:59:06</publishTime>
+ <publishTime>04/29/2026 16:46:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/27/2026 09:59:03</publishTime>
+ <publishTime>04/29/2026 16:46:15</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/27/2026 09:59:03</publishTime>
+ <publishTime>04/29/2026 16:46:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/27/2026 09:58:56</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/27/2026 09:58:56</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -150,10 +150,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>04/27/2026 09:58:57</publishTime>
+ <publishTime>04/29/2026 16:46:11</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/27/2026 09:58:57</publishTime>
+ <publishTime>04/29/2026 16:46:11</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -189,34 +189,34 @@
<publishTime>11/13/2012 20:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/27/2026 09:58:53</publishTime>
+ <publishTime>04/29/2026 16:46:09</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/27/2026 09:58:53</publishTime>
+ <publishTime>04/29/2026 16:46:09</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/27/2026 09:58:54</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/27/2026 09:58:54</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/27/2026 09:58:54</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/27/2026 09:58:54</publishTime>
+ <publishTime>04/29/2026 16:46:10</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>04/27/2026 09:58:50</publishTime>
+ <publishTime>04/29/2026 16:46:06</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>04/27/2026 09:58:50</publishTime>
+ <publishTime>04/29/2026 16:46:06</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -330,22 +330,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/27/2026 09:58:57</publishTime>
+ <publishTime>04/29/2026 16:46:12</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/27/2026 09:58:57</publishTime>
+ <publishTime>04/29/2026 16:46:12</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/27/2026 10:18:16</publishTime>
+ <publishTime>04/29/2026 16:46:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/27/2026 10:18:16</publishTime>
+ <publishTime>04/29/2026 16:46:25</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>04/27/2026 10:18:29</publishTime>
+ <publishTime>04/29/2026 16:46:42</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -570,7 +570,13 @@
<publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/22/2026 13:46:35</publishTime>
+ <publishTime>04/29/2026 16:47:03</publishTime>
+ </File>
+ <File Include="ZPLTemplate/鐗╂枡鏉＄爜 100脳60.zpl">
+ <publishTime>04/28/2026 17:03:29</publishTime>
+ </File>
+ <File Include="ZPLTemplate/鐗╂枡鏉＄爜 80脳60.zpl">
+ <publishTime>04/28/2026 09:32:53</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/GeTuiService.cs b/WebAPI/Service/GeTuiService.cs
index 865fa0d..2055e86 100644
--- a/WebAPI/Service/GeTuiService.cs
+++ b/WebAPI/Service/GeTuiService.cs
@@ -65,12 +65,17 @@
{
foreach (DataRow row in ds.Tables[1].Rows)
{
- if (userClientIDDictionary.ContainsKey(row["HUserName"].ToString())){
- userClientIDDictionary[row["HUserName"].ToString()].Add(row["HClientID"].ToString());
- }
- else
+ // 鍙湁鍦ㄧ嚎鐨勭敤鎴� 鍦ㄩ渶瑕佸姞鍏ュ埌寰呭彂閫佺敤鎴疯澶囧叧鑱斿瓧鍏镐腑 涓嶉渶瑕佺粰涓嶅湪绾跨殑鐢ㄦ埛鍙戞秷鎭�
+ if(row["HOnline"].ToString() == "1")
{
- userClientIDDictionary.TryAdd(row["HUserName"].ToString(), new List<string>() { row["HClientID"].ToString() });
+ if (userClientIDDictionary.ContainsKey(row["HUserName"].ToString()))
+ {
+ userClientIDDictionary[row["HUserName"].ToString()].Add(row["HClientID"].ToString());
+ }
+ else
+ {
+ userClientIDDictionary.TryAdd(row["HUserName"].ToString(), new List<string>() { row["HClientID"].ToString() });
+ }
}
}
}
diff --git a/WebAPI/Service/JwtAuthorizeAttribute.cs b/WebAPI/Service/JwtAuthorizeAttribute.cs
index 3ef48a0..9418f11 100644
--- a/WebAPI/Service/JwtAuthorizeAttribute.cs
+++ b/WebAPI/Service/JwtAuthorizeAttribute.cs
@@ -6,6 +6,7 @@
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
+using System.Web;
using System.Web.Http;
using System.Web.Http.Controllers;
using System.Web.Http.Filters;
@@ -53,6 +54,20 @@
return;
}
+ // 妫�鏌� Token鍜屽綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀尮閰�
+ var HUserName = GetUserNameFromHeader(actionContext) ?? "";
+ var TokenUserName = JWTHelper.getUserName(token);
+ if(!string.IsNullOrWhiteSpace(HUserName))
+ {
+ HUserName = HttpUtility.UrlDecode(HUserName);
+ }
+ if(TokenUserName != HUserName)
+ {
+ // 濡傛灉Token鍜屽綋鍓嶇櫥褰曠敤鎴蜂笉鍖归厤锛屽垯闇�瑕佸憡鐭ュ墠绔敤鎴� Token 杩囨湡锛岄渶閲嶆柊鐧诲綍
+ HandleUnauthorized(actionContext);
+ return;
+ }
+
// 璁剧疆鐢ㄦ埛
actionContext.RequestContext.Principal = principal;
@@ -146,6 +161,19 @@
return null;
}
+ // 浠嶩eader涓幏鍙栫敤鎴峰悕
+ private string GetUserNameFromHeader(HttpActionContext context)
+ {
+ var headers = context.Request.Headers;
+ string userName = "";
+ if (headers.Contains("X-Username"))
+ {
+ userName = headers.GetValues("X-Username").FirstOrDefault();
+ }
+
+ return userName;
+ }
+
// 401 鏈巿鏉�
private void HandleUnauthorized(HttpActionContext context)
{
diff --git a/WebAPI/Service/SignatureVerifyAttribute.cs b/WebAPI/Service/SignatureVerifyAttribute.cs
index 12e8ea2..1c9583a 100644
--- a/WebAPI/Service/SignatureVerifyAttribute.cs
+++ b/WebAPI/Service/SignatureVerifyAttribute.cs
@@ -6,6 +6,7 @@
using System.Web.Http;
using System.Web.Http.Controllers;
using System.Web.Http.Filters;
+using WebAPI;
using WebAPI.Service;
namespace project.Filter
@@ -53,7 +54,6 @@
}
var currentTs = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds;
var diff = Math.Abs(currentTs - ts);
-
if (diff > 300) // 300绉� = 5鍒嗛挓
{
actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.BadRequest,
@@ -69,26 +69,43 @@
if (!string.IsNullOrEmpty(query) && query.StartsWith("?"))
{
rawData = query.Substring(1);
+
}
}
else
{
+
+ var originalContentType = actionContext.Request.Content.Headers.ContentType;
+
+
var bodyBytes = await actionContext.Request.Content.ReadAsByteArrayAsync();
rawData = Encoding.UTF8.GetString(bodyBytes);
+
actionContext.Request.Content = new ByteArrayContent(bodyBytes);
- if (actionContext.Request.Content.Headers.ContentType != null)
+ if (originalContentType != null)
{
- actionContext.Request.Content.Headers.ContentType =
- new System.Net.Http.Headers.MediaTypeHeaderValue(
- actionContext.Request.Content.Headers.ContentType.MediaType);
+ actionContext.Request.Content.Headers.ContentType = originalContentType;
}
}
- var signStr = rawData + "×tamp=" + timestamp + "&nonce=" + nonce + "&key=" + SecretKey;
+ //else
+ //{
+ // var bodyBytes = await actionContext.Request.Content.ReadAsByteArrayAsync();
+ // rawData = Encoding.UTF8.GetString(bodyBytes);
+ // actionContext.Request.Content = new ByteArrayContent(bodyBytes);
+ // if (actionContext.Request.Content.Headers.ContentType != null)
+ // {
+ // actionContext.Request.Content.Headers.ContentType =
+ // new System.Net.Http.Headers.MediaTypeHeaderValue(
+ // actionContext.Request.Content.Headers.ContentType.MediaType);
+ // }
+ //}
+ rawData = rawData.Replace("'", "%27");
+ var signStr = rawData + "×tamp=" + timestamp + "&nonce=" + nonce + "&key=" + SecretKey;
var serverSign = ComputeHmacSha256(signStr, SecretKey);
-
+
if (serverSign != clientSign.ToUpper())
{
actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.Unauthorized,
diff --git a/WebAPI/Service/TokenAppendHandler.cs b/WebAPI/Service/TokenAppendHandler.cs
index 11409de..a231e8f 100644
--- a/WebAPI/Service/TokenAppendHandler.cs
+++ b/WebAPI/Service/TokenAppendHandler.cs
@@ -23,9 +23,14 @@
if (response.IsSuccessStatusCode && response.Content != null)
{
// 3. 鑾峰彇鏃� token
- var oldToken = request.Headers.GetValues("token")?.FirstOrDefault();
+ var oldToken = request.Headers.GetValues("authorization")?.FirstOrDefault();
if (string.IsNullOrEmpty(oldToken))
return response;
+ if (oldToken.StartsWith("Bearer "))
+ {
+ oldToken = oldToken.Replace("Bearer ", "").Trim();
+ }
+ WebAPI.LogService.Write($"oldToken: {oldToken}");
// 4. 鍒ゆ柇鏄惁闇�瑕佺画鏈�
bool needRenew = JWTHelper.TokenAboutToExpire(oldToken);
@@ -54,9 +59,10 @@
"application/json");
}
}
- catch
+ catch(Exception e)
{
-
+ WebAPI.LogService.Write(e);
+ return response;
}
return response;
diff --git a/WebAPI/Utility/JWTHelper.cs b/WebAPI/Utility/JWTHelper.cs
index 08bece3..d7bd23d 100644
--- a/WebAPI/Utility/JWTHelper.cs
+++ b/WebAPI/Utility/JWTHelper.cs
@@ -37,7 +37,7 @@
issuer: "zjzyms",
audience: HCampanyName,
claims: claims,
- expires: DateTime.UtcNow.AddHours(2), // 涓ゅ皬鏃惰繃鏈熸椂闂�
+ expires: DateTime.UtcNow.AddMinutes(120), // 涓ゅ皬鏃惰繃鏈熸椂闂�
signingCredentials: credentials
);
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index e823a54..8207cf6 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -142,15 +142,15 @@
</basicHttpBinding>
</bindings>
<client>
- <!-- <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> -->
- <endpoint address="http://localhost:81/MESWMS-WEBS/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <!--<endpoint address="http://localhost:81/MESWMS-WEBS/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />-->
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <!-- <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value> -->
- <value>http://localhost:81/MESWMS-WEBS/webservice1.asmx</value>
+ <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
+ <!--<value>http://localhost:81/MESWMS-WEBS/webservice1.asmx</value>-->
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5421b53..677b09f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -415,6 +415,8 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 80脳60.zpl" />
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 100脳60.zpl" />
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\BundleConfig.cs" />
@@ -427,6 +429,7 @@
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_DriverController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SampleSchemeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
@@ -513,6 +516,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
+ <Compile Include="Controllers\PM_ProjectCommunicationBillListController.cs" />
<Compile Include="Controllers\QC_InStockCheckBillController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentReportController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
@@ -1358,6 +1362,7 @@
<Folder Include="Views\Gy_RecConditionBill\" />
<Folder Include="Views\Gy_RepairCheckClass\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_SampleScheme\" />
<Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
<Folder Include="Views\Gy_SourceWorkStationSet\" />
@@ -1386,6 +1391,7 @@
<Folder Include="Views\Mes_OrderProcFlowAllReport\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\Pay_Report\" />
+ <Folder Include="Views\PM_ProjectCommunicationBillList\" />
<Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 19d92fd..e75219d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -17,8 +17,13 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+<<<<<<< HEAD
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
+=======
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git "a/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 100\303\22760.zpl" "b/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 100\303\22760.zpl"
new file mode 100644
index 0000000..2a316f7
--- /dev/null
+++ "b/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 100\303\22760.zpl"
@@ -0,0 +1,65 @@
+^XA
+^LL480
+^PW800
+^FO0,0^GB800,480,2^FS
+
+^SEE:UNICODE.DAT^FS
+^CWJ,E:simsun-18030.ttf^FS
+
+^FO0,0^GB540,60,1^FS
+^FO0,0^GB120,60,1^FS
+^FO10,24^AJN,20,20^CI28^FD缂栫爜(P)^FS
+^FO130,24^AJN,20,20^CI28^FD{{ 鐗╂枡浠ｇ爜 }}^FS
+
+^FO0,60^GB540,60,1^FS
+^FO0,60^GB120,60,1^FS
+^FO10,84^AJN,20,20^CI28^FD鐢熶骇鏃ユ湡^FS
+^FO130,84^AJN,20,20^CI28^FD{{ 鐢熶骇鏃ユ湡 }}^FS
+
+^FO0,120^GB540,60,1^FS
+^FO0,120^GB120,60,1^FS
+^FO10,144^AJN,20,20^CI28^FD瀹㈡埛璁㈠崟鍙穅FS
+^FO130,144^AJN,20,20^CI28^FD{{ 瀹㈡埛璁㈠崟鍙� }}^FS
+
+^FO0,180^GB540,60,1^FS
+^FO0,180^GB120,60,1^FS
+^FO10,204^AJN,20,20^CI28^FD閲囪喘璺熻釜鍙穅FS
+^FO130,204^AJN,20,20^CI28^FD{{ 閲囪喘璺熻釜鍙� }}^FS
+
+// 浜岀淮鐮侊細淇濇寔浣犲師鏉ュぇ灏忋�佷綅缃� 涓嶅彉
+^FO600,40^BQN,2,5^CI28^FDQA,{{ 鏉＄爜缂栧彿 }}^FS
+
+^FO0,240^GB800,60,1^FS
+^FO0,240^GB120,60,1^FS
+
+
+^FO460,240^GB100,60,1^FS
+^FO680,240^GB120,60,1^FS
+
+^FO10,260^AJN,20,20^CI28^FD鍚嶇О(N)^FS
+^FO130,260^AJN,20,20^CI28^FD{{ 鐗╂枡鍚嶇О }}^FS
+^FO480,260^AJN,20,20^CI28^FD鏁伴噺^FS
+^FO580,260^AJN,20,20^CI28^FD{{ 鏁伴噺 }}^FS
+^FO680,260^AJN,20,20^CI28^FD{{ 璁￠噺鍗曚綅 }}^FS
+
+^FO0,300^GB800,50,1^FS
+^FO0,300^GB120,50,1^FS
+^FO10,315^AJN,20,20^CI28^FD瑙勬牸鍨嬪彿^FS
+^FO130,315^AJN,20,20^CI28^FD{{ 瑙勬牸鍨嬪彿 }}^FS
+
+^FO0,350^GB800,50,1^FS
+^FO0,350^GB120,50,1^FS
+^FO10,365^AJN,20,20^CI28^FD浜у搧鍨嬪彿^FS
+^FO130,365^AJN,20,20^CI28^FD{{ 浜у搧鍨嬪彿 }}^FS
+
+^FO0,400^GB800,50,1^FS
+^FO0,400^GB120,50,1^FS
+^FO10,415^AJN,20,20^CI28^FD渚涘簲鍟哵FS
+^FO130,415^AJN,20,20^CI28^FD{{ 渚涘簲鍟� }}^FS
+
+^FO0,450^GB800,30,1^FS
+^FO0,450^GB120,30,1^FS
+^FO10,460^AJN,18,18^CI28^FDUPN^FS
+^FO130,460^AJN,18,18^CI28^FD{{ 鏉＄爜缂栧彿 }}^FS
+
+^XZ
\ No newline at end of file
diff --git "a/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 80\303\22760.zpl" "b/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 80\303\22760.zpl"
new file mode 100644
index 0000000..17b69b0
--- /dev/null
+++ "b/WebAPI/ZPLTemplate/\347\211\251\346\226\231\346\235\241\347\240\201 80\303\22760.zpl"
@@ -0,0 +1,75 @@
+^XA
+^LL480 // 鏍囩楂樺害锛�60mm @ 203DPI 鈮� 480 dots
+^PW640 // 鏍囩瀹藉害锛�80mm @ 203DPI 鈮� 640 dots
+^FO0,0^GB640,480,2^FS // 澶栨绾�
+//////////////////////////
+// 缁熶竴浣跨敤 simsun-18030 涓枃瀛椾綋
+//////////////////////////
+^CWJ,E:simsun-18030.ttf^FS
+// ========== 绗�1-4琛岋細宸︿晶鏂囨湰鍖� + 鍙充晶QR鐮� ==========
+// 绗�1琛� 缂栫爜(P)
+^FO0,0^GB420,60,1^FS
+^FO0,0^GB120,60,1^FS
+^FO10,24^AJN,20,20^CI28^FD缂栫爜(P)^FS
+^FO130,24^AJN,20,20^CI28^FD{{ 鐗╂枡浠ｇ爜 }}^FS
+
+// 绗�2琛� 鐢熶骇鏃ユ湡
+^FO0,60^GB420,60,1^FS
+^FO0,60^GB120,60,1^FS
+^FO10,84^AJN,20,20^CI28^FD鐢熶骇鏃ユ湡^FS
+^FO130,84^AJN,20,20^CI28^FD{{ 鐢熶骇鏃ユ湡 }}^FS
+
+// 绗�3琛� 瀹㈡埛璁㈠崟鍙�
+^FO0,120^GB420,60,1^FS
+^FO0,120^GB120,60,1^FS
+^FO10,144^AJN,20,20^CI28^FD瀹㈡埛璁㈠崟鍙穅FS
+^FO130,144^AJN,20,20^CI28^FD{{ 瀹㈡埛璁㈠崟鍙� }}^FS
+
+// 绗�4琛� 閲囪喘璺熻釜鍙�
+^FO0,180^GB420,60,1^FS
+^FO0,180^GB120,60,1^FS
+^FO10,204^AJN,20,20^CI28^FD閲囪喘璺熻釜鍙穅FS
+^FO130,204^AJN,20,20^CI28^FD{{ 閲囪喘璺熻釜鍙� }}^FS
+
+// QR鐮侊紙鍙充晶鍖哄煙锛�
+^FO450,40^BQN,2,6^CI28^FDQA,{{ 鏉＄爜缂栧彿 }}^FS
+
+// ========== 绗�5琛岋細鍚嶇О/鏁伴噺/鍗曚綅 ==========
+^FO0,240^GB640,60,1^FS
+^FO0,240^GB120,60,1^FS // 鍚嶇О(N)鍒�
+^FO120,240^GB240,60,1^FS // 鐗╂枡鍚嶇О鍒�
+^FO360,240^GB100,60,1^FS // 鏁伴噺鍒�
+^FO460,240^GB100,60,1^FS // 鏁板�煎垪
+^FO560,240^GB80,60,1^FS // 鍗曚綅鍒�
+
+^FO10,260^AJN,20,20^CI28^FD鍚嶇О(N)^FS
+^FO130,260^AJN,20,20^CI28^FD{{ 鐗╂枡鍚嶇О }}^FS
+^FO370,260^AJN,20,20^CI28^FD鏁伴噺^FS
+^FO470,260^AJN,20,20^CI28^FD{{ 鏁伴噺 }}^FS
+^FO570,260^AJN,20,20^CI28^FD{{ 璁￠噺鍗曚綅 }}^FS
+
+// ========== 绗�6琛岋細瑙勬牸鍨嬪彿 ==========
+^FO0,300^GB640,60,1^FS
+^FO0,300^GB120,60,1^FS
+^FO10,320^AJN,20,20^CI28^FD瑙勬牸鍨嬪彿^FS
+^FO130,320^AJN,20,20^CI28^FD{{ 瑙勬牸鍨嬪彿 }}^FS
+
+// ========== 绗�7琛岋細浜у搧鍨嬪彿 ==========
+^FO0,360^GB640,60,1^FS
+^FO0,360^GB120,60,1^FS
+^FO10,380^AJN,20,20^CI28^FD浜у搧鍨嬪彿^FS
+^FO130,380^AJN,20,20^CI28^FD{{ 浜у搧鍨嬪彿 }}^FS
+
+// ========== 绗�8琛岋細渚涘簲鍟� ==========
+^FO0,420^GB640,60,1^FS
+^FO0,420^GB120,60,1^FS
+^FO10,440^AJN,20,20^CI28^FD渚涘簲鍟哵FS
+^FO130,440^AJN,20,20^CI28^FD{{ 渚涘簲鍟� }}^FS
+
+// ========== 绗�9琛岋細UPN ==========
+^FO0,480^GB640,60,1^FS
+^FO0,480^GB120,60,1^FS
+^FO10,500^AJN,20,20^CI28^FDUPN^FS
+^FO130,500^AJN,20,20^CI28^FD{{ 鏉＄爜缂栧彿 }}^FS
+
+^XZ
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
deleted file mode 100644
index 82c4d76..0000000
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
deleted file mode 100644
index 06ae45c..0000000
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index cd3d4e6..5fb62d0 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -11,7 +11,6 @@
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
@@ -20,4 +19,11 @@
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index e11a207..7fd1cdb 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,6 @@
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
deleted file mode 100644
index 82c4d76..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
deleted file mode 100644
index 06ae45c..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1