From 17752a6ca5434cac875b98272c9bc7534ae4a059 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 07 一月 2026 20:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
WebAPI/WebAPI.csproj.user | 2
DBUtility/bin/Release/Pub_Class.dll | 0
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
WebAPI/Controllers/QC_InStockCheckBillController.cs | 384 +++++++
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 10
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml | 7
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 19
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/Models/HSouceOrderList.cs | 11
WebAPI/WebAPI.csproj | 2
BLL/bin/Release/Pub_Control.pdb | 0
DAL/ClsWL_YayBillMain.cs | 389 +++++++
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/物流管理/ClsWL_YayBillMainBillSub.cs | 48
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 28
WebAPI/Controllers/条码管理/WEBSController.cs | 3
Model/Model.csproj | 2
BLL/bin/Release/Pub_Control.dll | 0
WebAPI/Utility/Barcode.ashx.cs | 2
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/华远datamapping/Gy_PNLInfoController.cs | 7
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 2
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Web.config | 8
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
WebAPI/Models/ClsGy_PNLInfo.cs | 1
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 93 +
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 11
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 517 ++++++++++
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 42
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 16
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/物流管理/出运单/WLYayBillController.cs | 551 +++++++++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 23
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 1
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 347 +++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 176 +-
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 4
WebAPI/Models/ClsGy_PNLInfoSub.cs | 4
SQLHelper/bin/Release/Pub_Class.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
WarM/条码打印/Gy_BarCodeBillList.cs | 46
WebAPI/Models/HBarCodeList.cs | 6
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 5
Model/bin/Release/Model.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
/dev/null | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/Sc_ProcessMangementController.cs | 54
Model/物流管理/ClsWL_YayBillMainBillMain.cs | 55 +
WebAPI/DLL/ClsGy_Material_Ctl.cs | 4
120 files changed, 2,693 insertions(+), 188 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 0bd699f..f6f0464 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index a5c937f..a30bfe3 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index dc29da9..03fcd48 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 16a87f6..f376416 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index c31e45e..065cbca 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 5173062..953b5ad 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index 8a8eb9c..6e7943a 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index ee86724..b72d03b 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 1438760..068b2f7 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 90318a6..5d4d8bf 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/ClsWL_YayBillMain.cs b/DAL/ClsWL_YayBillMain.cs
new file mode 100644
index 0000000..bf3cd02
--- /dev/null
+++ b/DAL/ClsWL_YayBillMain.cs
@@ -0,0 +1,389 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsWL_YayBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsWL_YayBillMainBillMain omodel = new Model.ClsWL_YayBillMainBillMain();
+ public List<Model.ClsWL_YayBillMainBillSub> DetailColl = new List<Model.ClsWL_YayBillMainBillSub>();
+ string SafeString(string value, string defaultValue = "") =>
+ string.IsNullOrEmpty(value) ? defaultValue : value;
+
+ // 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负鏁存暟锛屽鐞唍ull銆佺┖瀛楃涓插拰闈炴暟瀛�
+ int SafeInt(string value, int defaultValue = 0) =>
+ int.TryParse(value, out int result) ? result : defaultValue;
+
+ // 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负灏忔暟
+ decimal SafeDecimal(string value, decimal defaultValue = 0) =>
+ decimal.TryParse(value, out decimal result) ? result : defaultValue;
+
+ // 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负鏃ユ湡
+ string SafeDateTime(string dateStr, string defaultValue)
+ {
+ if (string.IsNullOrEmpty(dateStr) || dateStr == "\"\"")
+ return defaultValue;
+
+ if (DateTime.TryParse(dateStr, out DateTime result) && result != DateTime.MinValue)
+ return "'" + result.ToString("yyyy-MM-dd HH:mm:ss") + "'";
+
+ return defaultValue;
+ }
+
+ public ClsWL_YayBillMain()
+ {
+ base.MvarItemKeySub = "WL_YayBillMain";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "WL_YayBillMain";
+ base.MvarReportTitle = "鍑鸿繍鍗�";
+ base.BillType = "3321";
+ base.HBillSubType = "3321";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsWL_YayBillMain()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_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.RunProc("UpDate WL_YayBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HChecker='" + omodel.HChecker.ToString()+ "'" +
+ ",HMainSourceBillType='" + omodel.HMainSourceBillType + "'" +
+ ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+ ",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
+ ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
+
+ ",HCusID='" + omodel.HCusID.ToString() + "'" +
+ ",HBeginAddr='" + omodel.HBeginAddr.ToString() + "'" +
+ ",HEndAddr='" + omodel.HEndAddr.ToString() + "'" +
+ ",HPickAddr='" + omodel.HPickAddr.ToString() + "'" +
+ ",HArriverAddr='" + omodel.HArriverAddr.ToString() + "'" +
+ ",HTransType='" + omodel.HTransType.ToString() + "'" +
+ ",HCarTypeID='" + omodel.HCarTypeID.ToString() + "'" +
+ ",HCarTypeMaxVolume='" + omodel.HCarTypeMaxVolume.ToString() + "'" +
+ ",HTotalVolume='" + omodel.HTotalVolume.ToString() + "'" +
+ ",HLoadingRate='" + omodel.HLoadingRate.ToString() + "'" +
+ ",HContractTransportInterID='" + omodel.HContractTransportInterID.ToString() + "'" +
+ ",HContractTransportEntryID='" + omodel.HContractTransportEntryID.ToString() + "'" +
+ ",HContractTransportBillNo='" + omodel.HContractTransportBillNo.ToString() + "'" +
+ ",HCarrierID='" + omodel.HCarrierID.ToString() + "'" +
+ ",HDistance='" + omodel.HDistance.ToString() + "'" +
+ ",HTransportTimes='" + omodel.HTransportTimes.ToString() + "'" +
+ ",HTransportTyep='" + omodel.HTransportTyep.ToString() + "'" +
+ ",HSSID='" + omodel.HSSID.ToString() + "'" +
+ ",HCurID='" + omodel.HCurID.ToString() + "'" +
+ ",HMoney='" + omodel.HMoney.ToString() + "'" +
+ ",HDateForRequestedPick='" + omodel.HDateForRequestedPick.ToString() + "'" +
+ ",HDataForRequestedArrived='" + omodel.HDataForRequestedArrived.ToString() + "'" +
+ ",HCarryStatus='" + omodel.HCarryStatus.ToString() + "'" +
+ ",HDate_CarrierSure='" + omodel.HDate_CarrierSure.ToString() + "'" +
+ ",HDate_AllocationDriver='" + omodel.HDate_AllocationDriver.ToString() + "'" +
+ ",HCarID='" + omodel.HCarID.ToString() + "'" +
+ ",HDriverID='" + omodel.HDriverID.ToString() + "'" +
+ ",HSurer_Arrive='" + omodel.HSurer_Arrive.ToString() + "'" +
+ ",HDate_Arrive='" + omodel.HDate_Arrive.ToString() + "'" +
+ ",HSurer_Pick='" + omodel.HSurer_Pick.ToString() + "'" +
+ ",HDate_Pick='" + omodel.HDate_Pick.ToString() + "'" +
+ ",HSurer_Trans='" + omodel.HSurer_Trans.ToString() + "'" +
+ ",HDate_Trans='" + omodel.HDate_Trans.ToString() + "'" +
+ ",HSurer_Receive='" + omodel.HSurer_Receive.ToString() + "'" +
+ ",HDate_Receive='" + omodel.HDate_Receive.ToString() + "'" +
+ ",HSurer_Accounting='" + omodel.HSurer_Accounting.ToString() + "'" +
+ ",HDate_Accounting='" + omodel.HDate_Accounting.ToString() + "'" +
+
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ oCn.RunProc("delete from WL_YayBillSub_Material where HInterID=" + lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ string sql = "";
+ foreach (Model.ClsWL_YayBillMainBillSub oSub in DetailColl)
+ {
+ sql = "Insert into WL_YayBillSub_Material " +
+ "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
+ ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
+ + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
+ + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
+ + (oSub.HEntryID) + ",'" // HEntryID int
+ + SafeString(oSub.HCloseMan?.ToString()) + "','" // HCloseMan varchar(20)
+ + (oSub.HEntryCloseDate == null ? DateTime.Now : oSub.HEntryCloseDate) + "'," // HEntryCloseDate datetime
+ + (oSub.HCloseType ? "1" : "0") + ",'" // HCloseType bit
+ + SafeString(oSub.HRemark?.ToString() ?? "") + "'," // HRemark varchar(200)
+ + (oSub.HSourceInterID == null ? 0 : oSub.HSourceInterID) + "," // HSourceInterID int
+ + (oSub.HSourceEntryID == null ? 0 : oSub.HSourceEntryID) + ",'" // HSourceEntryID int
+ + SafeString(oSub.HSourceBillNo?.ToString(), "") + "','" // HSourceBillNo varchar(50)
+ + SafeString(oSub.HSourceBillType?.ToString(), "") + "'," // HSourceBillType varchar(10)
+ + (oSub.HRelationQty == null ? 0 : oSub.HRelationQty) + "," // HRelationQty dec(18,8)
+ + (oSub.HRelationMoney) + "," // HRelationMoney dec(18,8)
+ + (oSub.HMaterID) + "," // HMaterID int
+ + (oSub.HUnitID.ToString() == "" ? 0 : oSub.HUnitID) + "," // HUnitID int
+ + (oSub.HMouldID) + "," // HMouldID int
+ + (oSub.HMouldLength.ToString() == "" ? 0 : oSub.HMouldLength) + "," // HMouldLength dec(18,8)
+ + (oSub.HMouldHeight.ToString() == "" ? 0 : oSub.HMouldHeight) + "," // HMouldHeight dec(18,8)
+ + (oSub.HMouldWidth.ToString() == "" ? 0 : oSub.HMouldWidth) + "," // HMouldWidth dec(18,8)
+ + (oSub.HMouldFoldHeight.ToString() == "" ? 0 : oSub.HMouldFoldHeight) + "," // HMouldFoldHeight dec(18,8)
+ + (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
+ + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
+ + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
+ + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
+ oCn.RunProc(sql);
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ oCn.BeginTran();
+ // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿锛岀敤浜庣┖鏃ユ湡瀛楁鐨勯粯璁ゅ��
+ // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
+ string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负瀛楃涓诧紝澶勭悊null鍜岀┖瀛楃涓�
+
+
+ string sql = "Insert Into WL_YayBillMain " +
+ "(HInterID,HYear,HPeriod,HBillType,HBillSubType,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,HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr," +
+ "HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
+ "HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
+ "HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
+ "HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
+ "HDataForRequestedArrived,HCarryStatus,HDate_CarrierSure," +
+ "HDate_AllocationDriver,HCarID,HDriverID,HSurer_Arrive,HDate_Arrive," +
+ "HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive," +
+ "HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
+ "values(" +
+ SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
+ "0,0," + // HYear, HPeriod - 闇�瑕佷粠HDate璁＄畻锛岃繖閲屽厛缁�0
+ "'" + SafeString(this.BillType) + "'," +
+ "'" + SafeString(this.HBillSubType) + "'," +
+ SafeDateTime(omodel.HDate.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + SafeString(omodel.HBillNo) + "'," +
+ SafeInt(omodel.HBillStatus.ToString(), 1) + "," + // HBillStatus
+ SafeInt(omodel.HCheckItemNowID.ToString(), 0) + "," + // HCheckItemNowID
+ SafeInt(omodel.HCheckItemNextID.ToString(), 0) + "," + // HCheckItemNextID
+ SafeInt(omodel.HCheckFlowID.ToString(), 0) + "," + // HCheckFlowID
+ "'" + SafeString(omodel.HRemark) + "'," +
+ "'" + SafeString(omodel.HBacker) + "'," +
+ SafeDateTime(omodel.HBackDate?.ToString(), "NULL") + "," +
+ "'" + SafeString(omodel.HBackRemark) + "'," +
+ "'" + SafeString(omodel.HChecker) + "'," +
+ SafeDateTime(omodel.HCheckDate?.ToString(), "NULL") + "," +
+ "'" + SafeString(omodel.HMaker) + "',getdate()," + // HMaker, HMakeDate
+ "'" + SafeString(omodel.HUpDater) + "'," +
+ SafeDateTime(omodel.HUpDateDate?.ToString(), "NULL") + "," +
+ "'" + SafeString(omodel.HCloseMan) + "'," +
+ SafeDateTime(omodel.HCloseDate?.ToString(), "NULL") + "," +
+ (omodel.HCloseType.ToString() == "1" ? "1" : "0") + "," + // HCloseType
+ "'" + SafeString(omodel.HDeleteMan) + "'," +
+ SafeDateTime(omodel.HDeleteDate?.ToString(), "NULL") + "," +
+ "'" + SafeString(omodel.HMainSourceBillType) + "'," +
+ SafeInt(omodel.HMainSourceInterID.ToString(), 0) + "," + // HMainSourceInterID
+ SafeInt(omodel.HMainSourceEntryID.ToString(), 0) + "," + // HMainSourceEntryID
+ "'" + SafeString(omodel.HMainSourceBillNo) + "'," +
+ SafeInt(omodel.HPrintQty.ToString(), 0) + "," + // HPrintQty
+ SafeInt(omodel.HOrgID.ToString(), 0) + "," + // HOrgID
+ SafeInt(omodel.HCusID?.ToString(), 0) + "," + // HCusID
+ SafeInt(omodel.HBeginAddr?.ToString(), 0) + "," + // HBeginAddr
+ SafeInt(omodel.HEndAddr?.ToString(), 0) + "," + // HEndAddr
+ "'" + SafeString(omodel.HPickAddr) + "'," +
+ "'" + SafeString(omodel.HArriverAddr) + "'," +
+ "'" + SafeString(omodel.HTransType) + "'," +
+ SafeInt(omodel.HCarTypeID?.ToString(), 0) + "," + // HCarTypeID
+ SafeDecimal(omodel.HCarTypeMaxVolume?.ToString(), 0) + "," + // HCarTypeMaxVolume
+ SafeDecimal(omodel.HTotalVolume?.ToString(), 0) + "," + // HTotalVolume
+ SafeDecimal(omodel.HLoadingRate?.ToString(), 0) + "," + // HLoadingRate
+ SafeInt(omodel.HContractTransportInterID?.ToString(), 0) + "," + // HContractTransportInterID
+ SafeInt(omodel.HContractTransportEntryID?.ToString(), 0) + "," + // HContractTransportEntryID
+ "'" + SafeString(omodel.HContractTransportBillNo) + "'," +
+ SafeInt(omodel.HCarrierID?.ToString(), 0) + "," + // HCarrierID
+ SafeDecimal(omodel.HDistance?.ToString(), 0) + "," + // HDistance
+ SafeDecimal(omodel.HTransportTimes?.ToString(), 0) + "," + // HTransportTimes
+ "'" + SafeString(omodel.HTransportTyep) + "'," +
+ SafeInt(omodel.HSSID?.ToString(), 0) + "," + // HSSID
+ SafeInt(omodel.HCurID?.ToString(), 0) + "," + // HCurID
+ SafeDecimal(omodel.HMoney?.ToString(), 0) + "," + // HMoney
+ SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
+ SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
+ SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
+ SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
+ "'" + SafeString(omodel.HSurer_Arrive) + "'," +
+ SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + SafeString(omodel.HSurer_Pick) + "'," +
+ SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + SafeString(omodel.HSurer_Trans) + "'," +
+ SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + SafeString(omodel.HSurer_Receive) + "'," +
+ SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," +
+ "'" + SafeString(omodel.HSurer_Accounting) + "'," +
+ SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")";
+
+ oCn.RunProc(sql);
+ //涓昏〃
+ //鎻掑叆瀛愯〃
+
+ foreach (Model.ClsWL_YayBillMainBillSub oSub in DetailColl)
+ {
+ sql = "Insert into WL_YayBillSub_Material " +
+ "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
+ ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
+ + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
+ + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
+ + (oSub.HEntryID) + ",'" // HEntryID int
+ + SafeString(oSub.HCloseMan?.ToString()) + "','" // HCloseMan varchar(20)
+ + (oSub.HEntryCloseDate == null ? DateTime.Now : oSub.HEntryCloseDate) + "'," // HEntryCloseDate datetime
+ + (oSub.HCloseType ? "1" : "0") + ",'" // HCloseType bit
+ + SafeString(oSub.HRemark?.ToString() ?? "") + "'," // HRemark varchar(200)
+ + (oSub.HSourceInterID == null ? 0 : oSub.HSourceInterID) + "," // HSourceInterID int
+ + (oSub.HSourceEntryID == null ? 0 : oSub.HSourceEntryID) + ",'" // HSourceEntryID int
+ + SafeString(oSub.HSourceBillNo?.ToString(), "") + "','" // HSourceBillNo varchar(50)
+ + SafeString(oSub.HSourceBillType?.ToString(), "") + "'," // HSourceBillType varchar(10)
+ + (oSub.HRelationQty == null ? 0 : oSub.HRelationQty) + "," // HRelationQty dec(18,8)
+ + (oSub.HRelationMoney) + "," // HRelationMoney dec(18,8)
+ + (oSub.HMaterID) + "," // HMaterID int
+ + (oSub.HUnitID.ToString() == "" ? 0 : oSub.HUnitID) + "," // HUnitID int
+ + (oSub.HMouldID) + "," // HMouldID int
+ + (oSub.HMouldLength.ToString() == "" ? 0 : oSub.HMouldLength) + "," // HMouldLength dec(18,8)
+ + (oSub.HMouldHeight.ToString() == "" ? 0 : oSub.HMouldHeight) + "," // HMouldHeight dec(18,8)
+ + (oSub.HMouldWidth.ToString() == "" ? 0 : oSub.HMouldWidth) + "," // HMouldWidth dec(18,8)
+ + (oSub.HMouldFoldHeight.ToString() == "" ? 0 : oSub.HMouldFoldHeight) + "," // HMouldFoldHeight dec(18,8)
+ + (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
+ + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
+ + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
+ + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
+ oCn.RunProc(sql);
+ }
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
+
+ }
+
+}
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index ec5e9b6..87c6dcd 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -81,6 +81,7 @@
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsGy_MaterialPackingRelation.cs" />
+ <Compile Include="ClsWL_YayBillMain.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index dc29da9..03fcd48 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 16a87f6..f376416 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index c31e45e..065cbca 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 5173062..953b5ad 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index 8a8eb9c..6e7943a 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index ee86724..b72d03b 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 1438760..068b2f7 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index 90318a6..5d4d8bf 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index c31e45e..065cbca 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 5173062..953b5ad 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 1438760..068b2f7 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index 90318a6..5d4d8bf 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 6991f48..f976bcc 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 56b7521..83d8a15 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index dba98a7..d04dc37 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index c31e45e..065cbca 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 5173062..953b5ad 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 949d008..fca16fa 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -126,6 +126,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
<Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillMain.cs" />
<Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillSub.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsWL_YayBillMainBillSub.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsWL_YayBillMainBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index c31e45e..065cbca 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 5173062..953b5ad 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index 8a8eb9c..6e7943a 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index ee86724..b72d03b 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 1438760..068b2f7 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index 90318a6..5d4d8bf 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 934e166..d96c94e 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index 8a8eb9c..6e7943a 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index ee86724..b72d03b 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillMain.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillMain.cs"
new file mode 100644
index 0000000..6955470
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillMain.cs"
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsWL_YayBillMainBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HCheckEmp;
+ public Int64 HDeptID;
+ public Int64 HEmpID;
+ public Int64 HOrgID;
+ public Int64 HPrintQty;
+
+ // 新增字段
+ public int? HCusID; // 客户ID
+ public int? HBeginAddr; // 始发地
+ public int? HEndAddr; // 目的地
+ public string HPickAddr; // 提货地址
+ public string HArriverAddr; // 到货地址
+ public string HTransType; // 运输方式（整车、零单）
+ public int? HCarTypeID; // 车型ID
+ public decimal? HCarTypeMaxVolume; // 车型最大容积
+ public decimal? HTotalVolume; // 总体积（平方米）
+ public decimal? HLoadingRate; // 装载率
+ public int? HContractTransportInterID; // 承运合同ID
+ public int? HContractTransportEntryID; // 承运合同子ID
+ public string HContractTransportBillNo; // 承运合同单据号
+ public int? HCarrierID; // 承运商ID
+ public decimal? HDistance; // 距离（公里）
+ public decimal? HTransportTimes; // 运输时效
+ public string HTransportTyep; // 运输类型（单程，往返）
+ public int? HSSID; // 结算方式
+ public int? HCurID; // 币别
+ public decimal? HMoney; // 运输费用
+
+ public DateTime? HDateForRequestedPick; // 要求提货时间
+ public DateTime? HDataForRequestedArrived; // 要求到货时间
+ public int? HCarryStatus; // 物流状态（1-9）
+ public DateTime? HDate_CarrierSure; // 承运商确认时间
+ public DateTime? HDate_AllocationDriver; // 分配司机时间
+ public int? HCarID; // 车辆ID
+ public int? HDriverID; // 司机ID
+ public string HSurer_Arrive; // 到厂确认人
+ public DateTime? HDate_Arrive; // 到厂确认时间
+ public string HSurer_Pick; // 提货确认人
+ public DateTime? HDate_Pick; // 提货确认时间
+ public string HSurer_Trans; // 出厂运输确认人
+ public DateTime? HDate_Trans; // 出厂运输确认时间
+ public string HSurer_Receive; // 签收确认人
+ public DateTime? HDate_Receive; // 签收确认时间
+ public string HSurer_Accounting; // 核算人
+ public DateTime? HDate_Accounting; // 核算时间
+ }
+}
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillSub.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillSub.cs"
new file mode 100644
index 0000000..8841cab
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsWL_YayBillMainBillSub.cs"
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsWL_YayBillMainBillSub : DBUtility.ClsXt_BaseBillMain
+ {
+ // 关联主表
+ public int HInterID { get; set; } // 主内码
+ public string HBillNo_bak { get; set; } // 单据号（备份）
+
+ // 子表信息
+ public int HEntryID { get; set; } // 子内码
+
+ // 行关闭相关
+ public string HCloseMan { get; set; } // 行关闭人
+ public DateTime HEntryCloseDate { get; set; } // 行关闭日期
+ public bool HCloseType { get; set; } // 关闭类型
+
+ // 备注
+ public string HRemark { get; set; } // 表体备注
+
+ // 源单信息
+ public int HSourceInterID { get; set; } // 源单ID
+ public int HSourceEntryID { get; set; } // 源单子ID
+ public string HSourceBillNo { get; set; } // 源单单号
+ public string HSourceBillType { get; set; } // 源单类型
+ public decimal HRelationQty { get; set; } // 关联数量
+ public decimal HRelationMoney { get; set; } // 关联金额
+
+ // 自增列
+ public int HItemSubID { get; set; } // 自增列
+
+ ///自定义
+ public int HMaterID { get; set; }
+ public int HUnitID { get; set; }
+ public int HMouldID { get; set; }
+ public decimal HMouldLength { get; set; }
+ public decimal HMouldHeight { get; set; }
+ public decimal HMouldWidth { get; set; }
+ public decimal HMouldFoldHeight { get; set; }
+ public decimal HVolume { get; set; }
+ public decimal HQty { get; set; }
+ public decimal HSNP { get; set; }
+ public decimal HMouldQty { get; set; }
+ }
+}
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index 60d993b..c0635b3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index 3e2bd2a..ca3eca3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 1438760..068b2f7 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index 90318a6..5d4d8bf 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index d0e99e8..d232864 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 0906096..b975629 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 2e49e93..24e73cf 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 762995a..78afe09 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 1f3ac20..278e1a9 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index d8e48a9..c1cb681 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 9679f05..d4f984c 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 60d993b..c0635b3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index 3e2bd2a..ca3eca3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index fea44e6..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 9a8ce2e..6cc6882 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -20,11 +20,6 @@
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -35,4 +30,8 @@
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index d8e48a9..c1cb681 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 9679f05..d4f984c 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 487581f..dd1ef6e 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,5 +1,5 @@
-D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+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
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
index 60d993b..c0635b3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
index 3e2bd2a..ca3eca3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/SyntacticSugar/obj/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
index 0d742fb..93ad32e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
@@ -29,6 +29,7 @@
public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
public const string ModRightNamePrint = ModRightName + "_Print"; //鎵撳嵃
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public int selectRow = 0;
@@ -225,6 +226,27 @@
}
else
{
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBillByOrgID(DBUtility.ClsPub.HOrgID, ref sErrMsg) == true)
+ {
+ //闄dmin璐﹀彿澶栵紝鍙兘鍒犻櫎褰撳墠璐﹀彿鎵�鐢熸垚鐨勬潯鐮�
+ if (DBUtility.ClsPub.CurUserName.ToUpper() != "ADMIN" //admin璐﹀彿
+ && oSystemParameter.omodel.BarCode_DeleterAndMakerMustSame.ToUpper() == "Y") //绯荤粺鍙傛暟 鍒跺崟浜轰笌鍒犻櫎浜烘槸鍚︿竴鑷�
+ {
+ if (DBUtility.ClsPub.CurUserName != DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[0].Cells[Fun_GetCol("鍒朵綔浜�")].Value))
+ {
+ MessageBox.Show("鍒犻櫎浜轰笌鍒跺崟浜哄繀椤讳竴鑷达紝鍒犻櫎澶辫触锛�", "鎻愮ず");
+ return;
+ }
+ }
+ }
+ else
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛�", "鎻愮ず");
+ return;
+ }
+
if (MessageBox.Show("纭畾瑕佸垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
Int64 HItemID = 0;
@@ -271,6 +293,30 @@
}
else
{
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBillByOrgID(DBUtility.ClsPub.HOrgID, ref sErrMsg) == true)
+ {
+ //闄dmin璐﹀彿澶栵紝鍙兘鍒犻櫎褰撳墠璐﹀彿鎵�鐢熸垚鐨勬潯鐮�
+ if (DBUtility.ClsPub.CurUserName.ToUpper() != "ADMIN" //admin璐﹀彿
+ && oSystemParameter.omodel.BarCode_DeleterAndMakerMustSame.ToUpper() == "Y") //绯荤粺鍙傛暟 鍒跺崟浜轰笌鍒犻櫎浜烘槸鍚︿竴鑷�
+ {
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ if (DBUtility.ClsPub.CurUserName != DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鍒朵綔浜�")].Value))
+ {
+ MessageBox.Show("瀛樺湪鍒犻櫎浜轰笌鍒跺崟浜轰笉涓�鑷寸殑琛岋紝鍒犻櫎澶辫触锛�", "鎻愮ず");
+ return;
+ }
+ }
+ }
+ }
+ else
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛�", "鎻愮ず");
+ return;
+ }
+
if (MessageBox.Show("纭畾瑕佹壒閲忓垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
string HItemID = "";
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 8fbe91d..cefa5c5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2891,7 +2891,6 @@
string HUpDater = mainList[0].HUpDater;
string HMaterNumber = mainList[0].HMaterNumber;
string HSupNumber = mainList[0].HSupNumber;
- long HPrintQty = mainList[0].HPrintQty;
string HMouldOWNER = mainList[0].HMouldOWNER;
string HSaveLife = mainList[0].HSaveLife;
int HCaveQty = mainList[0].HCaveQty;
@@ -2949,7 +2948,7 @@
}
//=========================================================
- //涓昏〃
+ //涓昏〃
oCN.RunProc("UpDate Gy_MouldFileMain set " +
" HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + HDate + "'" +
@@ -2979,7 +2978,6 @@
",HDeptID=" + HDeptID.ToString() +
",HSupID=" + HSupID.ToString() +
",HSupNumber='" + HSupNumber + "'" +
- ",HPrintQty=" + HPrintQty.ToString() +
",HMouldStatus='" + HMouldStatus + "'" +
",HSaveLife='" + HSaveLife + "'" +
",HWhID=" + HWHID.ToString() +
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 6914c54..bc0c468 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -948,7 +948,7 @@
using (StreamReader sr = new StreamReader(Path.Combine(path, $"{language}.json"), Encoding.UTF8))
{
string lines;
- while ((lines = sr.ReadLine()) != null)//涓�琛屼竴琛屽幓璇伙紝濡傛灉璇诲彇杩欎竴琛岃祴鍊糽ines,骞朵笖lines= null璇佹槑璇诲彇瀹屼簡
+ while ((lines = sr.ReadLine()) != null)
{
JsonStr1 += lines;
@@ -981,7 +981,7 @@
keySelector: p => $@"{p.HModuleCode}_{p.HFieldCode}",
elementSelector: p => p.rowNum
);
-
+ int subIndex = 0;
// 鐗堟湰鍙蜂笉涓�鑷� 鍒欒鍙栨暟鎹簱涓殑瀛楁锛屽皢瀛楁鍐欏叆鍒癹son瀵硅薄涓�
foreach (DataRow row in ds.Tables[0].Rows)
{
@@ -1007,8 +1007,23 @@
languagePack[HModuleCode][HFieldCode] = new JArray();
}
- var targetJArray = (JArray)languagePack[HModuleCode][HFieldCode];
- targetJArray.Add(row[lang].ToString());
+ var targetJArray = languagePack[HModuleCode][HFieldCode] as JArray;
+
+ if (subIndex < rowNum - 1)
+ {
+ if (targetJArray.Count < subIndex + 1)
+ {
+ targetJArray.Add(row[lang].ToString());
+ }else
+ {
+ targetJArray[subIndex] = row[lang].ToString();
+ }
+ subIndex++;
+ }else
+ {
+ subIndex = 0;
+ }
+
}
}
@@ -1019,7 +1034,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Success锛�";
- objJsonResult.data = languagePack.ToString();
+ objJsonResult.data = languagePack;
return objJsonResult;
} else
{
@@ -1027,7 +1042,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Success锛�";
- objJsonResult.data = JsonStr1;
+ objJsonResult.data = JObject.Parse(JsonStr1);
return objJsonResult;
}
}
@@ -1036,6 +1051,72 @@
LogService.Write("Exception锛�" + e.ToString());
objJsonResult.code = "0";
objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍗曟嵁缈昏瘧 璇█鍖呯己澶辩殑閿� 鍙嶅悜鏄犲皠鍒版暟鎹簱
+ [Route("Xt_grdAlignment_WMES/syncMissingKeyToDB")]
+ [HttpGet]
+ public Object syncMissingKeyToDB(string missingObj)
+ {
+ oCN.BeginTran();
+ try
+ {
+ // 閫掑叆鐨勫弬鏁� 缁撴瀯鏄� { 妯″潡鍚�: [瀛楁鍚�1,瀛楁鍚�2] }
+ JObject missingKeys = JObject.Parse(missingObj);
+
+
+ // 閬嶅巻椤跺眰JObject瀵硅薄
+ foreach(var HMouldNameKVP in missingKeys)
+ {
+ // 鏌ヨ涓昏〃涓槸鍚﹀瓨鍦ㄨ妯″潡 瀛樺湪锛屽垯杩斿洖涓昏〃涓殑妯″潡HInterID锛屼笉瀛樺湪锛屽垯鑾峰彇鏈�澶InterID+1
+ string HMouldCode = HMouldNameKVP.Key;
+ ds = oCN.RunProcReturn($"Exec h_p_syncMissingKeyToDB @HModuleCode='{HMouldCode}'", "h_p_syncMissingKeyToDB");
+ int HInterID = (int)ds.Tables[0].Rows[0]["HInterID"];
+ int rowCount = (int)ds.Tables[0].Rows[0]["rc"];
+ int HEntryID = (int)ds.Tables[0].Rows[0]["HEntryID"];
+
+ // 鎻掑叆涓昏〃
+ if (rowCount == 0)
+ {
+ oCN.RunProc($@"insert into Xt_LanModuleMain(HInterID, HBillType, HModuleName, HModuleCode)
+ values({HInterID}, 3033, '', '{HMouldCode}')");
+ }
+
+
+ string sql = $@"insert into Xt_LanModuleSub(HInterID, HEntryID, HFieldModelType, HFieldCode, HFieldName, HTranslationText_English, HTranslationText_Spain)
+ values";
+ // 鎻掑叆瀛愯〃
+ JArray HFieldCodes = HMouldNameKVP.Value as JArray;
+ for(int i=0;i<HFieldCodes.Count; i++)
+ {
+
+ sql += $@"({HInterID}, {HEntryID+i}, 'i18n', '{HFieldCodes[i]}','{HFieldCodes[i]}','{HFieldCodes[i]}','{HFieldCodes[i]}'),";
+ }
+
+ sql = sql.Substring(0, sql.Length - 1) + ";";
+
+ oCN.RunProc(sql);
+ }
+
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Success!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ LogService.Write("Exception锛�" + e.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.Message.ToString();
objJsonResult.data = null;
return objJsonResult;
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index bd7fe67..bc1f3fa 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -1728,11 +1728,11 @@
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID desc", "Sc_SourceLineRepairBillSub_Mater");
oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater
-(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID
-,HSourceEntryID,HSourceBillNo,HSourceBillType,HMaterID
-,HUnitID,HBarCode,HBatchNo )values
-({model.HInterID},{(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)},'{model.HBillNo}','',{temp.HProcExchInterID}
-,{temp.HProcExchEntryID},'{temp.HProcExchBillNo}','',{temp.HMaterID},0,'{temp.HBarCode}','{temp.HBatchNo}')");
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID
+ ,HSourceEntryID,HSourceBillNo,HSourceBillType,HMaterID
+ ,HUnitID,HBarCode,HBatchNo )values
+ ({model.HInterID},{(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)},'{model.HBillNo}','',{temp.HProcExchInterID}
+ ,{temp.HProcExchEntryID},'{temp.HProcExchBillNo}','',{temp.HMaterID},0,'{temp.HBarCode}','{temp.HBatchNo}')");
//淇敼浜х嚎杩芥函鍗曠粦瀹氱殑鏉＄爜鎵瑰彿
oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
@@ -1743,21 +1743,21 @@
model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);
oCN.RunProc($@"insert into Sc_SourceLineRepairBillMain(HYear, HPeriod, HBillType, HBillSubType, HInterID,
-HDate, HBillNo, HBillStatus, HRemark, HEmpID, HDeptID, HSourceID, HProdOrgID, HMaterID, HWorkStationID,
-HProcess, HIPAddr, HMacAddr, HProdMac, HBarCode,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
-values('{DateTime.Now.Year}','{DateTime.Now.Month}','3748','3748',{model.HInterID}
-,getdate(),'{model.HBillNo}','1','{HResult}',{model.HEmpID},{model.HDeptID},{model.HSourceID},{model.HProdOrgID},{model.HMaterID},0
-,{model.HProcess},'','','','{model.HBarCode}','{user}',getdate(),{model.HICMOInterID},{model.HICMOEntryID},'{model.HICMOBillNo}')");
+ HDate, HBillNo, HBillStatus, HRemark, HEmpID, HDeptID, HSourceID, HProdOrgID, HMaterID, HWorkStationID,
+ HProcess, HIPAddr, HMacAddr, HProdMac, HBarCode,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ values('{DateTime.Now.Year}','{DateTime.Now.Month}','3748','3748',{model.HInterID}
+ ,getdate(),'{model.HBillNo}','1','{HResult}',{model.HEmpID},{model.HDeptID},{model.HSourceID},{model.HProdOrgID},{model.HMaterID},0
+ ,{model.HProcess},'','','','{model.HBarCode}','{user}',getdate(),{model.HICMOInterID},{model.HICMOEntryID},'{model.HICMOBillNo}')");
List<Model.ClsSc_SourceLineRepairBillSub> subLsit = new List<Model.ClsSc_SourceLineRepairBillSub>();
sMainStr = "[" + sMainStr + "]";
subLsit = JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub>>(sMainStr);
oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub
-(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
-,HBadReasonID,HBadTypeID,HBadResultID,HBadProcID,HRepairResult,HCreator,HCreateDate)
-values({model.HInterID},1,'{model.HBillNo}','',{subLsit[0].HProcExchInterID},{subLsit[0].HProcExchEntryID},'{subLsit[0].HProcExchBillNo}',''
-,{subLsit[0].HBadReasonID},{subLsit[0].HBadTypeID},{subLsit[0].HBadResultID},{model.HBadProcID},'{HResult}','{subLsit[0].HCreator}',getdate())");
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
+ ,HBadReasonID,HBadTypeID,HBadResultID,HBadProcID,HRepairResult,HCreator,HCreateDate)
+ values({model.HInterID},1,'{model.HBillNo}','{model.HRemark}',{subLsit[0].HProcExchInterID},{subLsit[0].HProcExchEntryID},'{subLsit[0].HProcExchBillNo}',''
+ ,{subLsit[0].HBadReasonID},{subLsit[0].HBadTypeID},{subLsit[0].HBadResultID},{model.HBadProcID},'{HResult}','{subLsit[0].HCreator}',getdate())");
if (HResult == "OK")
{
diff --git a/WebAPI/Controllers/QC_InStockCheckBillController.cs b/WebAPI/Controllers/QC_InStockCheckBillController.cs
new file mode 100644
index 0000000..ce64712
--- /dev/null
+++ b/WebAPI/Controllers/QC_InStockCheckBillController.cs
@@ -0,0 +1,384 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using SyntacticSugar.constant;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ /// <summary>
+ /// 鍦ㄥ簱妫�楠屽崟鎺у埗鍣�
+ /// </summary>
+ public class QC_InStockCheckBillController : ApiController
+ {
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ #region 鍦ㄥ簱妫�楠屽崟鎻愪氦鍗曟嵁
+ [Route("QC_InStockCheckBill/saveBill")]
+ [HttpPost]
+ public Object saveBill([FromBody] JObject sMainSub)
+ {
+ // 姝ゅ 琛ㄥ崟缁撴瀯: {sMain: sMain, sSub: {materNum: [BarCodeInfo]}}
+ JObject sMain = sMainSub["sMain"] as JObject;
+ JObject sSub = sMainSub["sSub"] as JObject;
+
+ oCN.BeginTran();
+
+ try
+ {
+ int i = 1;
+ // 鎻掑叆涓昏〃
+
+ oCN.RunProc($@"
+ insert into QC_InStockCheckBillMain(HYear, HPeriod, HBillType, HInterID, HDate,
+ HBillNo, HBillStatus, HMaker, HMakeDate)
+ values({sMain["HYear"]}, {sMain["HPeriod"]}, '{sMain["HBillType"]}', {sMain["HInterID"]}, CONVERT(DATE, '{sMain["HDate"]}'),
+ '{sMain["HBillNo"]}', 1, '{sMain["HUser"]}', getdate());
+ ");
+
+ foreach (var sSubKVP in sSub)
+ {
+ JObject sSubValue = sSubKVP.Value as JObject;
+ // 鎻掑叆瀛愯〃
+ oCN.RunProc($@"
+ insert into QC_InStockCheckBillSub(HInterID, HBillNo_bak, HEntryID, HInStockCheckEmp, HInStockCheckTime,
+ HMaterID, HRightQty, HBadQty)
+ values({sMain["HInterID"]}, '{sMain["HBillNo"]}', {i++}, '{sMain["HUser"]}', getdate(), {sSubValue["HMaterID"]}
+ , {sSubValue["HRightQty"]}, {sSubValue["HBadQty"]})
+ ");
+
+
+ // 鍙嶅啓鏉＄爜涓绘。
+ JArray HBarCodeCache = sSubValue["HBarCodeCache"] as JArray;
+ foreach (var HBarCode in HBarCodeCache)
+ {
+ LogService.Write($@"update Gy_BarCodeBill set HBarCodeStatus='{HBarCode["HBarCodeState"]}' where HBarCode='{HBarCode["HBarCode"]}' ");
+ oCN.RunProc($@"update Gy_BarCodeBill set HBarCodeStatus='{HBarCode["HBarCodeState"]}' where HBarCode='{HBarCode["HBarCode"]}' ");
+ }
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Success!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch(Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+ #endregion
+
+ #region 鍦ㄥ簱妫�楠屽崟 鎵墿鏂欑爜 甯﹀嚭鐗╂枡/鏉＄爜涓存椂琛ㄤ俊鎭�
+ internal class ClsKF_PonderationBillMain_Temp_InStockCheckBill
+ {
+ public long HItemID;
+ public long HSourceEntryID;
+ public string HSourceBillNo;
+ public string HSourceBillType;
+ public long HRelationInterID;
+ public long HRelationEntryID;
+ public string HRelationBillNo;
+ public long HErpClsID;
+ public bool HRedBlueFlag;
+ public string HBatchNo;
+ public long HInstructID;
+ public string HInstructNo;
+ public long HSeOrderBillID;
+ public string HSeOrderBillNo;
+ public string HNordan;
+ public long HAuxPropID;
+ public string HMTONo;
+ public long HSTOCKORGID;
+ public long HOWNERID;
+ public string HCusBarCode;
+ public string HSubBillType;
+ public long HMulSourceBill;
+ public string HBeginDate;
+ public string HEndDate;
+ public long HSourceInterID;
+ public long HUnitID;
+ public DateTime HMakeDate;
+ public string HAddr;
+ public long HInterID;
+ public string HBillNo;
+ public string HBillType;
+ public long HMaterID;
+ public string HMaterNumber;
+ public string HMaterName;
+ public string HMaterModel;
+ public long HProcID;
+ public string HProcName;
+ public long HWhID;
+ public string HWhName;
+ public long HSCWHID;
+ public string HSCWHName;
+ public long HStockPlaceID;
+ public string HStockPlaceName;
+ public long HOutStockPlaceID;
+ public string HOutStockPlaceName;
+ public long HGroupID;
+ public string HGroupName;
+ public double HQtyMust;
+ public double HQty;
+ public double HPieceQty;
+ public string HBarCode;
+ public string HMaker;
+ public string HBarCodeStatus;
+ public double HBadQty;
+ public double HRightQty;
+ }
+
+ [Route("QC_InStockCheckBill/getBarCode")]
+ [HttpGet]
+ public Object getBarCode(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, string HScanStyle, string HCustom1, string HCustom2, string sBarCodeStatus)
+ {
+ ClsKF_PonderationBillMain_Temp_InStockCheckBill oMain = new ClsKF_PonderationBillMain_Temp_InStockCheckBill();
+ string sErrMsg = "";
+ oCN.BeginTran();
+ try
+ {
+ if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == false)
+ {
+ sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return null;
+ }
+ // 姝ゆ帶鍒跺櫒鍗曟嵁绫诲瀷鍥哄畾涓� 7526
+ var ds2 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp_InStockCheckBill where HBarCode='" + sBarCode + "'and HInterID = " + HInterID, "KF_PonderationBillMain_Temp_InStockCheckBill");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList where 鏉＄爜缂栧彿='" + sBarCode + "'", "h_v_IF_BarCodeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵爜澶辫触! 璇ユ潯鐮佷笉鍦ㄦ潯鐮佹。妗堜腑...";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵爜澶辫触! 姝ゅ崟鎹凡鎵繃璇ユ潯鐮�...";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ var rowOne = ds.Tables[0].Rows[0];
+ oMain.HBillNo = HBillNo;
+ oMain.HBillType = HBillType;
+ oMain.HMaker = HMaker;
+ oMain.HMaterID = long.Parse(rowOne["HMaterID"].ToString());
+ oMain.HQtyMust = 0;
+ oMain.HQty = double.Parse(rowOne["鏁伴噺"].ToString());
+ oMain.HMTONo = rowOne["璁″垝璺熻釜鍙�"].ToString();
+ oMain.HWhID = HWhID;
+ oMain.HStockPlaceID = HSPID;
+ oMain.HSCWHID = 0;
+ oMain.HOutStockPlaceID = 0;
+ oMain.HPieceQty = 1;
+ oMain.HSourceInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]);
+ oMain.HSourceEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]);
+ oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["婧愬崟鍗曞彿"]);
+ oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillType"]);
+ oMain.HSTOCKORGID = HStockOrgID;
+ oMain.HOWNERID = HStockOrgID;
+ oMain.HCusBarCode = HCustom1;
+ oMain.HBarCode = sBarCode;
+ oMain.HBarCodeStatus = sBarCodeStatus;
+ oMain.HBadQty = 0;
+ oMain.HRightQty = 0;
+ if(sBarCodeStatus == "姝ｅ父")
+ {
+ oMain.HRightQty = oMain.HQty;
+ }
+ else if (sBarCodeStatus == "寮傚父")
+ {
+ oMain.HBadQty = oMain.HQty;
+ }
+ // 鍐欏叆涓存椂琛�
+ oCN.RunProc("Insert into KF_PonderationBillMain_Temp_InStockCheckBill " +
+ "(HInterID,HBillNo,HBillType,HMaterID,HUnitID,HAuxPropID,HProcID" +
+ ",HWhID,HSCWHID,HStockPlaceID,HOutStockPlaceID,HGroupID,HAddr" +
+ ",HQtyMust,HQty,HPieceQty,HBatchNo,HBarCode,HBarCode_Pack" +
+ ",HMaker,HMakeDate,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo" +
+ ",HRelationInterID,HRelationEntryID,HRelationBillNo,HRedBlueFlag,HMTONo,HPlanMode" +
+ ",HSTOCKORGID,HOtherOrgID,HOWNERID,HOWNERTYPEID,HExpressNumber,HSubBillType" +
+ ",HCusID,HDeptID,HCusBarCode,HMulSourceBill,HBeginDate,HEndDate, HBadQty, HRightQty, HBarCodeStatus) " +
+ " Values(" + HInterID + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'," + oMain.HMaterID.ToString() + "," + oMain.HUnitID.ToString() + "," + oMain.HAuxPropID.ToString() + "," + oMain.HProcID.ToString() +
+ "," + oMain.HWhID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HStockPlaceID.ToString() + "," + oMain.HOutStockPlaceID.ToString() + "," + oMain.HGroupID.ToString() + ",'" + oMain.HAddr + "'" +
+ "," + oMain.HQtyMust.ToString() + "," + oMain.HQty.ToString() + "," + oMain.HPieceQty.ToString() + ",'" + oMain.HBatchNo + "','" + oMain.HBarCode + "',''" +
+ ",'" + oMain.HMaker + "',getdate()," + oMain.HSourceInterID.ToString() + "," + oMain.HSourceEntryID.ToString() + ",'" + oMain.HSourceBillType + "','" + oMain.HSourceBillNo + "'" +
+ "," + oMain.HRelationInterID.ToString() + "," + oMain.HRelationEntryID.ToString() + ",'" + oMain.HRelationBillNo + "'," + Convert.ToString(oMain.HRedBlueFlag ? 1 : 0) + ",'" + oMain.HMTONo + "',0" +
+ "," + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() + "," + oMain.HSTOCKORGID.ToString() + ",'','','" + oMain.HSubBillType + "'" +
+ ",0,0,'" + oMain.HCusBarCode + "'," + oMain.HMulSourceBill.ToString() + "," + (oMain.HBeginDate == "" ? "NULL" : "'" + oMain.HBeginDate + "'") +
+ "," + (oMain.HEndDate == "" ? "NULL" : "'" + oMain.HEndDate + "'") + $@",{oMain.HBadQty}, {oMain.HRightQty}, '{oMain.HBarCodeStatus}')");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch(Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杩斿洖鐗╂枡/鏉＄爜鏄庣粏
+ [Route("QC_InStockCheckBillController/GetBillEntryTmpList_Json")]
+ [HttpGet]
+ public object GetBillEntryTmpList_Json(long HInterID, string HBillNo, int HBillType, int HStockOrgID)
+ {
+ try
+ {
+ DataSet DS = oCN.RunProcReturn("exec h_p_WMS_BillEntryTmpList_InStockCheckBill " + HInterID.ToString() + ",'" + HBillType + "'", "h_p_WMS_BillEntryTmpList_InStockCheckBill");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = DS.Tables;
+ return objJsonResult;
+ }
+ catch(Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍦ㄥ簱妫�楠屽崟 鍒犻櫎鏉＄爜缂撳瓨
+ [Route("QC_InStockCheckBillController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json")]
+ [HttpGet]
+ public object set_DelPonderationBillMain_Temp_InterIDAndSource_Json(long HItemID, long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string HBillType)
+ {
+ try
+ {
+ oCN.RunProc("Delete from KF_PonderationBillMain_Temp_InStockCheckBill where HItemID="+HItemID+" and HInterID=" + HInterID.ToString() + " and HMaterID= " + HMaterID.ToString() + " and HAuxPropID= " + HAuxPropID.ToString() + " and HBillType='" + HBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鎵�閫夎鏉＄爜鍑哄叆搴撲复鏃惰〃璁板綍澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍦ㄥ簱妫�楠屽崟 鑾峰彇鍗曟嵁鍒楄〃
+ [Route("QC_InStockCheckBillController/getList")]
+ [HttpGet]
+ public Object getList(string sWhere, string user)
+ {
+ try {
+ if (string.IsNullOrWhiteSpace(sWhere))
+ {
+ ds = oCN.RunProcReturn($@"select * from h_v_QC_InStockCheckBillList", "h_v_QC_InStockCheckBillList");
+ }else
+ {
+ ds = oCN.RunProcReturn($@"select * from h_v_QC_InStockCheckBillList where 1 = 1 and {sWhere}", "");
+ }
+
+ 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 = "鑾峰彇鍗曟嵁鍒楄〃澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ #region 鍦ㄥ簱妫�楠屽崟 鑾峰彇鍗曟嵁鍒楄〃鍒嗛〉
+ [Route("QC_InStockCheckBillController/getListPage")]
+ [HttpGet]
+ public object getListPage(string sWhere, string user, string page, string size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (string.IsNullOrWhiteSpace(sWhere) == false)
+ {
+ sWhere = sWhere.Replace("\"", "'");
+ sWhere = sWhere.Replace("'", "''");
+ }
+
+ string sql = "exec h_p_QC_InStockCheckBillListPage " + page + "," + size + ",'" + sWhere + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_InStockCheckBillListPage");
+
+ //娣诲姞鍒楀悕
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 94d6155..13dd4a1 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1708,22 +1708,26 @@
return objJsonResult;
}
- // string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
- // join AIS20210811135644..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
- // join AIS20210811135644..T_BD_STAFFTEMP c on c.FID = a.FID
- // join AIS20210811135644..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
- // where e.HItemID ='" + HKeeperID + "' ";
- // //鏌ヨ璐ㄦ鍛樺搴旇川妫�閮ㄩ棬
- // ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
- // LogService.Write("sql" + sql);
- // if (ds.Tables[0].Rows.Count == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鎿嶄綔澶辫触,璐ㄦ鍛樺搴旇川妫�閮ㄩ棬鏃犳暟鎹��" + sql;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
+ //if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ //{
+ string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
+ join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
+ join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
+ join JL20250716203240..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
+ where e.HItemID ='" + HKeeperID + "' ";
+ //鏌ヨ璐ㄦ鍛樺搴旇川妫�閮ㄩ棬
+ ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
+ LogService.Write("sql" + sql);
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,璐ㄦ鍛樺搴旇川妫�閮ㄩ棬鏃犳暟鎹��" + sql;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //}
+
JObject model = new JObject();
@@ -1732,8 +1736,12 @@
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
- //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
- //model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
+ //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
+
+ //if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ //{
+ model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
+ //}
model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡
model.Add("FBillNo", HBillNo);
@@ -1888,7 +1896,15 @@
//鏂囦欢IO娴�
string a = Convert.ToBase64String(buffer);
- ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ //if(oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ //{
+ ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ //}
+ //else
+ //{
+ // ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ //}
+
HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
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 228f7c8..3d3e923 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"
@@ -699,9 +699,17 @@
ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HProduceDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鐢熶骇鏃ユ湡"]);
+ ordrlist.HExpiryDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鏈夋晥鏈熻嚦"]);
+ ordrlist.HISKFPERIOD = int.Parse(dt.Rows[i]["HISKFPERIOD"].ToString());
+ ordrlist.HEXPUNIT = dt.Rows[i]["HEXPUNIT"].ToString(); //鏈夋晥鏈熷崟浣�(鏃ャ�佹湀銆佸勾)
+ ordrlist.HEXPPERIOD = double.Parse(dt.Rows[i]["HEXPPERIOD"].ToString()); //鏈夋晥鏈熷��
- if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
{
+ ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
+ ordrlist.HAuxPropNumber = dt.Rows[i]["杈呭姪灞炴�т唬鐮�"].ToString();
+ ordrlist.HAuxPropName = dt.Rows[i]["杈呭姪灞炴��"].ToString();
if (oSystemParameter.omodel.WMS_CampanyName.Contains("鍥涚淮灏�"))
{
@@ -744,6 +752,8 @@
{
ordrlist.HGiveAwayFlag = 0;
}
+ ordrlist.HSeOrderBillNo = dt.Rows[i]["閿�鍞鍗曞彿"].ToString();
+ ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["閿�鍞鍗曡鍙�"].ToString());
}
if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟")
{
@@ -2692,6 +2702,341 @@
}
#endregion
+ #region [鏉＄爜鐢熸垚鎺ュ彛-閿﹂殕]
+ [Route("Sc_BarCode/Sub_SaveBill_JinLong")]
+ [HttpPost]
+ public object Sub_SaveBill_JinLong([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //鐗╂枡璁板綍
+ string HOrgType = sArray[1].ToString(); //缁勭粐鍚嶇О
+ string HSourceBillTypeName = sArray[2].ToString(); //婧愬崟绫诲瀷鍚嶇О
+ string CampanyName = sArray[3].ToString() == "xxx" ? "" : sArray[4].ToString(); //鍔犲伐宸ュ巶鍚嶇О
+ string UserName = sArray[4].ToString(); //鐧诲綍璐﹀彿
+ ClsPub.CurUserName = UserName;
+
+ string HSelectBarCodeType = "鍞竴鏉＄爜"; //鏉＄爜绫诲瀷
+
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return objJsonResult;
+ }
+
+ //鐢熸垚鏉＄爜
+ SaveBarCode_JinLong(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[鏉＄爜鐢熸垚鏂规硶_閿﹂殕]
+ private object SaveBarCode_JinLong(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
+ {
+ DateTime sDate = DateTime.Now; //鏃ユ湡
+ string HSourceBillType_Temp = ""; //婧愬崟绫诲瀷
+ int n = 0; //鍚屾壒鐢熸垚鐨勬潯鐮佺储寮�
+
+ //鑾峰彇鏄庣粏淇℃伅
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+
+ DataSet Ds;
+ for (int i = 0; i < ordrlist.Count; i++)
+ {
+ HSourceBillType_Temp = ordrlist[i].HBillType;
+
+ if (ClsPub.isLong(ordrlist[i].HMaterID) != 0)
+ {
+ if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ {
+ //鎷嗗垎姣忔潯鐗╂枡璁板綍涓哄鏉℃潯鐮佽褰�
+ double HSumQty = ClsPub.isDoule(ordrlist[i].HQty); //浜у搧鏁伴噺
+ double HQty = ClsPub.isDoule(ordrlist[i].HQty); //鏁伴噺
+ double HMinQty = ClsPub.isDoule(ordrlist[i].HMinQty); //鏈�灏忓寘瑁呮暟
+ int HBQty = ClsPub.isInt(ordrlist[i].HBQty); //绠辨暟
+ string WeiShu = ""; //灏炬暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ //鍗曚釜鏉＄爜鏁伴噺
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 4; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HPOOrderBillMTO_TMN = DBUtility.ClsPub.isStrNull(ordrlist[i].HPOOrderBillMTO); //閲囪喘璺熻釜鍙�
+
+ //鏉＄爜鍓嶇紑 = 閲囪喘璺熻釜鍙�
+ sTMNumber = HPOOrderBillMTO_TMN;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
+ LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
+
+ //鏉＄爜缂栧彿 = 閲囪喘璺熻釜鍙� + 鐗╂枡浠ｇ爜 + 鐢熶骇鏃ユ湡(yyyy/MM/dd) + 鍗曠鏁伴噺 + 4浣嶆祦姘村彿
+ string HMaterNumber_BarCode = DBUtility.ClsPub.isStrNull(ordrlist[i].HMaterNumber);
+ string HInspectionDate_BarCode = DBUtility.ClsPub.isStrNull(ordrlist[i].HInspectionDate).Replace("-", "/");
+ string HQty_BarCode = ClsPub.isStrNull(HMinQty);
+ HBarCode_Temp = HPOOrderBillMTO_TMN + "|" + HMaterNumber_BarCode + "|" + HInspectionDate_BarCode + "|" + HQty_BarCode + "|" + LSH;
+
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = HBarCode_Temp;
+ barcode.HBarCodeType2 = "鍞竴鏉＄爜";
+ barcode.HBarCodeSubType2 = "";
+ barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
+ barcode.HMaterID2 = ordrlist[i].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[i].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[i].HMaterName;
+ barcode.HMaterModel2 = ordrlist[i].HMaterModel;
+ barcode.HPinfan2 = ordrlist[i].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[i].HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist[i].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[i].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[i].HAuxPropName;
+ barcode.HUnitID2 = ordrlist[i].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[i].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[i].HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist[i].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[i].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[i].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[i].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[i].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[i].HBQty;
+ barcode.HSupID2 = ordrlist[i].HSupID;
+ barcode.HSupNumber2 = ordrlist[i].HSupNumber;
+ barcode.HSupName2 = ordrlist[i].HSupName;
+ barcode.HDeptID2 = ordrlist[i].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[i].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[i].HDeptName;
+ barcode.HRemark2 = ordrlist[i].HRemark;
+ barcode.HDate2 = ordrlist[i].HDate;
+ barcode.HShowDate2 = ordrlist[i].HShowDate;
+ barcode.HWhID2 = ordrlist[i].HWhID;
+ barcode.HWhNumber2 = ordrlist[i].HWhNumber;
+ barcode.HWhName2 = ordrlist[i].HWhName;
+ barcode.HSPID2 = ordrlist[i].HSPID;
+ barcode.HSPNumber2 = ordrlist[i].HSPNumber;
+ barcode.HSPName2 = ordrlist[i].HSPName;
+ barcode.HMTONo2 = ordrlist[i].HMTONo;
+ barcode.HCusID2 = ordrlist[i].HCusID;
+ barcode.HCusNumber2 = ordrlist[i].HCusNumber;
+ barcode.HCusName2 = ordrlist[i].HCusName;
+ barcode.HCusType2 = ordrlist[i].HCusType;
+ barcode.HSourceID2 = ordrlist[i].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[i].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[i].HSourceName;
+ barcode.HEndDate2 = ordrlist[i].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[i].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[i].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[i].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[i].HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist[i].HCoilNO;
+ barcode.HFurnaceNO = ordrlist[i].HFurnaceNO;
+ barcode.HFactory = ordrlist[i].HFactory;
+ barcode.HAuxQty = ordrlist[i].HAuxQty;
+ barcode.HheatNO = ordrlist[i].HheatNO;
+ barcode.HGroupID2 = ordrlist[i].HGroupID;
+ barcode.HEmpID2 = ordrlist[i].HEmpID;
+ barcode.HCusModel2 = ordrlist[i].HCusModel;
+ barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HReInspectionFlag = ordrlist[i].HReInspectionFlag ? 1 : 0;
+ barcode.HInspectionDate = ordrlist[i].HReInspectionFlag? ordrlist[i].HInspectionDate:null;
+ barcode.HInspectionCycle = ordrlist[i].HReInspectionFlag ? ordrlist[i].HInspectionCycle : 0;
+ barcode.HReInspectionDate = ordrlist[i].HReInspectionFlag ? ordrlist[i].HReInspectionDate : null;
+ barcode.HSeOrderBillNo2 = DBUtility.ClsPub.isStrNull(ordrlist[i].HPOOrderBillMTO);
+ ListRows.Add(barcode);
+
+ n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); //鏇存柊鏈�澶ф祦姘村彿
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ try
+ {
+ oCN.BeginTran();
+ for (int i = 0; i < ListRows.Count; i++)
+ {
+ if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
+ {
+ string HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
+ string HBarCodeType = ClsPub.isStrNull(ListRows[i].HBarCodeType2);
+ string HBarCodeSubType = ClsPub.isStrNull(ListRows[i].HBarCodeSubType2);
+ Int64 HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
+ Int64 HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
+ Int64 HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
+ Int64 HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
+ double HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
+ string HWei = ClsPub.isStrNull(ListRows[i].HWei);
+ string HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
+ Int64 HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
+ Int64 HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
+ string HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
+ string HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
+ Int64 HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
+ Int64 HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
+ Int64 HSupID = ClsPub.isLong(ListRows[i].HSupID2);
+ Int64 HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
+ Int64 HWhID = ClsPub.isLong(ListRows[i].HWhID2);
+ Int64 HSPID = ClsPub.isLong(ListRows[i].HSPID2);
+ string HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
+ string HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
+ string HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
+ string HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
+ string HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
+ Int64 HCusID = ClsPub.isLong(ListRows[i].HCusID2);
+ string HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
+ DateTime HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
+ string HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
+ string HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
+ string HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
+ bool HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+ int HPrintQty = ClsPub.isInt(ListRows[i].HPrint);
+
+ string HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
+ string HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
+ string HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
+ Int64 HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
+ string HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
+ DateTime HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
+ DateTime HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
+ int HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
+ Int64 HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
+ string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
+ string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+ string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
+ int HReInspectionFlag = ClsPub.isInt(ListRows[i].HReInspectionFlag);
+ string HInspectionDate = ListRows[i].HInspectionDate;
+ int HInspectionCycle = ClsPub.isInt(ListRows[i].HInspectionCycle);
+ string HReInspectionDate = ListRows[i].HInspectionDate;
+ string HCustomBatchNo = ClsPub.isStrNull(ListRows[i].HInspectionDate).Replace("-","");
+ string HBarCodeStatus = "姝ｅ父";
+
+ string sql_produceBarCode = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HCustomBatchNo,HBarCodeStatus" +
+ ",HReInspectionFlag,HInspectionDate,HInspectionCycle,HReInspectionDate " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
+ + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HCustomBatchNo + "','" + HBarCodeStatus + "'" +
+ "," + HReInspectionFlag + "," + (HInspectionDate == null ? "null" : "'" + HInspectionDate + "'") + "," + HInspectionCycle + "," + (HReInspectionDate == null ? "null" : "'" + HReInspectionDate + "'") +
+ ")";
+
+ oCN.RunProc(sql_produceBarCode);
+
+ }
+ }
+ oCN.Commit();
+ List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
+ //鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
+ string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region [app 鏉＄爜鎷嗙爜鑾峰彇瀛愭潯鐮乚
[Route("Sc_BarCode/SplitBarCode_Sub")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_PNLInfoController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_PNLInfoController.cs"
index dc7581d..9351577 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_PNLInfoController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/Gy_PNLInfoController.cs"
@@ -284,9 +284,10 @@
return objJsonResult;
}
- string sql1 = "insert into Gy_PNLInfo(HLayOutName,HIcon,HRowCount,HColCount,HMaker,HMakeDate,HPNLPosition_x,HPNLPosition_y) values(" +
+ string sql1 = "insert into Gy_PNLInfo(HLayOutName,HIcon,HMirrorType,HRowCount,HColCount,HMaker,HMakeDate,HPNLPosition_x,HPNLPosition_y) values(" +
"N'" + list[0].HLayOutName + "'," +
"N'" + list[0].HIcon + "'," +
+ "N'" + list[0].HMirrorType + "'," +
"N'" + list[0].HRowCount + "'," +
"N'" + list[0].HColCount + "'," +
"N'" + list[0].HMaker + "'," +
@@ -517,6 +518,7 @@
[HttpPost]
public object EditBill([FromBody] JObject oMain)
{
+ oCN.BeginTran();
try
{
var _value = oMain["oMain"].ToString();
@@ -544,7 +546,7 @@
return objJsonResult;
}
- oCN.BeginTran();
+
DataSet ds_editCheck;
//淇濆瓨鍓嶆帶鍒�=========================================
ds_editCheck = oCN.RunProcReturn("Exec h_p_Gy_PNLInfo_BeforeSaveCtrl " + msg4 + ",'2'", "h_p_Gy_PNLInfo_BeforeSaveCtrl");
@@ -583,6 +585,7 @@
sb.Append("Update Gy_PNLInfo set ");
sb.Append("HLayOutName=N'"+ list[0].HLayOutName + "',");
sb.Append("HIcon=N'" + list[0].HIcon + "',");
+ sb.Append("HMirrorType=N'" + list[0].HMirrorType + "',");
sb.Append("HRowCount=N'" + list[0].HRowCount + "',");
sb.Append("HColCount=N'" + list[0].HColCount + "',");
sb.Append("HPNLPosition_x=N'" + list[0].HPNLPosition_x + "',");
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index 30f6587..5a26b78 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -1255,6 +1255,8 @@
string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
+ //string sql = "exec h_p_Gy_GetMappingData_JiGuangGe '" + HBarCode_PNL + "','" + HSetNo + "'";
+ //ds = oCN.RunProcReturn(sql, "h_p_Gy_GetMappingData_JiGuangGe");
string sql = "" +
"select distinct * from (" +
//"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
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 b5d5add..579811a 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"
@@ -13700,7 +13700,7 @@
#endregion
#region 娣诲悍鏍规嵁灏忚溅鏉＄爜鎵惧嚭鐩稿簲鐗╂枡
- #endregion
+
[Route("WEBSController/GetMaterIDByCarBarCode")]
[HttpGet]
public object GetMaterIDByCarBarCode(string CarBarCode)
@@ -13743,5 +13743,6 @@
return objJsonResult;
}
}
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
new file mode 100644
index 0000000..c851767
--- /dev/null
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
@@ -0,0 +1,551 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class WLYayBillController : ApiController
+ {
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DataSet ds1 = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+
+ #region 鍒嗛〉鍒楄〃
+ [Route("WLYayBillController/GetListPage")]
+ [HttpGet]
+ public object GetListPage(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_WL_YayBill order by 鍗曟嵁鍙� desc", "锘縣_v_WL_YayBill");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WL_YayBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_WL_YayBill");
+ }
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
+ [Route("WLYayBillController/GetMesByOrginBill")]
+ [HttpGet]
+ public object GetMesByOrginBill(string ListMaterial)
+ {
+ try
+ {
+ if (ListMaterial.EndsWith(";"))
+ {
+ ListMaterial = ListMaterial.Remove(ListMaterial.Length - 1);
+ }
+ ListMaterial = ListMaterial.Replace(';', ',');
+ List<object> columnNameList = new List<object>();
+
+
+
+ ds = oCN.RunProcReturn("select a.*,b.HUnitID from h_v_Gy_MaterialPackingRelationList_Edit a left JOIN Gy_Material b on a.HMaterID=b.HItemID where HDefaultSendPackFlag=1 and HMaterID in (" + ListMaterial+")", "锘縣_v_Gy_MaterialPackingRelationList");
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 淇濆瓨/缂栬緫
+
+ [Route("WLYayBillController/SaveBill")]
+ [HttpPost]
+ public object SaveBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsWL_YayBillMain oBill = new DAL.ClsWL_YayBillMain();
+ List<Model.ClsWL_YayBillMainBillMain> lsmain = new List<Model.ClsWL_YayBillMainBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_WL_YayBillMainMain(msg2);
+ foreach (Model.ClsWL_YayBillMainBillMain oItem in lsmain)
+ {
+ oItem.HMaker = msg4;
+ DBUtility.ClsPub.CurUserName = msg4; //鍒跺崟浜�
+ oItem.HBillType = "3321";
+ oItem.HBillSubType = "3321";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HCheckEmp = oItem.HEmpID;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsWL_YayBillMainBillSub> ls = new List<Model.ClsWL_YayBillMainBillSub>();
+ ls = oListModels.getObjectByJson_WL_YayBillMainBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsWL_YayBillMainBillSub oItem in ls)
+ {
+
+ i++;
+ oItem.HEntryID = i;
+ oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItem.HCloseType = false; //鍏抽棴绫诲瀷
+ oBill.DetailColl.Add(oItem);
+
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ [Route("WLYayBillController/WL_YayBillDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> WL_YayBillDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select * from h_v_WL_YayBillEdit where HInterID= " + HID + " ", "h_v_WL_YayBillEdit");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+
+ #region 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/AuditWLYayBill")]
+ [HttpGet]
+ public object AuditWLYayBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update WL_YayBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update WL_YayBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 渚涘簲鍟嗙‘璁ゆ椂闂�
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/ConfrimBillNo")]
+ [HttpGet]
+ public object ConfrimBillNo(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+
+ oCN.BeginTran();
+
+
+ oCN.RunProc("update WL_YayBillMain set HDate_CarrierSure='" + DateTime.Now.ToString("yyyy-MM-dd") + "' where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鍏朵粬纭
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/ConfrimOtherBillNo")]
+ [HttpGet]
+ public object ConfrimOtherBillNo(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+
+ oCN.BeginTran();
+ if(IsAudit== 1)
+ {
+ oCN.RunProc("update WL_YayBillMain set HSurer_Arrive='" + CurUserName + "',HDate_Arrive=getdate() where HInterID=" + HInterID);
+ }
+ else if(IsAudit == 2)
+ {
+ oCN.RunProc("update WL_YayBillMain set HSurer_Pick='" + CurUserName + "',HDate_Pick=getdate() where HInterID=" + HInterID);
+
+ }
+ else if(IsAudit == 3)
+ {
+ oCN.RunProc("update WL_YayBillMain set HSurer_Trans='" + CurUserName + "',HDate_Trans=getdate() where HInterID=" + HInterID);
+
+ }
+ else if(IsAudit == 4)
+ {
+ oCN.RunProc("update WL_YayBillMain set HSurer_Receive='" + CurUserName + "',HDate_Receive=getdate() where HInterID=" + HInterID);
+
+ }
+ else
+ {
+ throw new Exception();
+ }
+
+ 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
+
+
+ #region 閫夋嫨杞﹁締鍜屽徃鏈�
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/selectDriver")]
+ [HttpGet]
+ public object selectDriver(int HInterID,int HcheckID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ DataSet ds;
+ if(IsAudit==1)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CarList where HItemID=" + HcheckID, "h_v_Gy_CarList");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oCN.BeginTran();
+
+
+ oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "' where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ oCN.Commit();
+ return objJsonResult;
+ }
+
+
+ }
+ else
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_driver where HItemID=" + HcheckID, "h_v_Gy_driver");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oCN.BeginTran();
+
+
+ oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "',HDate_AllocationDriver=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ oCN.Commit();
+ return objJsonResult;
+ }
+ }
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�";
+ objJsonResult.data = null;
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index e3007c9..865ad5c 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -128,7 +128,7 @@
",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
- ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume,HNetWeight" +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume,HNetWeight,HCheckEmp" +
",HWeight,HColor,HMaxPOQty,HSubjoin,HEngName) " +
" Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -141,7 +141,7 @@
oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
- oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "','"+oModel.HNetWeight+"'"+
+ oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "','"+oModel.HNetWeight + "','" + oModel.HCheckEmp + "'"+
",'" + oModel.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
sql = "set identity_insert gy_material off";
oCn.RunProc(sql);
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index c6ce47b..8deb00e 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -711,6 +711,17 @@
return list;
}
/// <summary>
+ /// 澶勭悊杩愬崟json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsWL_YayBillMainBillMain> getObjectByJson_WL_YayBillMainMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsWL_YayBillMainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃淇濆吇淇℃伅鐨刯son
/// </summary>
/// <param name="jsonString"></param>
@@ -745,6 +756,14 @@
return list;
}
+
+ public List<Model.ClsWL_YayBillMainBillSub> getObjectByJson_WL_YayBillMainBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsWL_YayBillMainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillSub>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨楠屾敹鍗曚富琛ㄧ殑json
diff --git a/WebAPI/Models/ClsGy_PNLInfo.cs b/WebAPI/Models/ClsGy_PNLInfo.cs
index d0d4434..f71bac4 100644
--- a/WebAPI/Models/ClsGy_PNLInfo.cs
+++ b/WebAPI/Models/ClsGy_PNLInfo.cs
@@ -12,6 +12,7 @@
public string HLayOutName { get; set; }
public string HIcon { get; set; }
+ public string HMirrorType { get; set; }
public int HRowCount { get; set; }
diff --git a/WebAPI/Models/ClsGy_PNLInfoSub.cs b/WebAPI/Models/ClsGy_PNLInfoSub.cs
index 90146fd..07fa395 100644
--- a/WebAPI/Models/ClsGy_PNLInfoSub.cs
+++ b/WebAPI/Models/ClsGy_PNLInfoSub.cs
@@ -14,7 +14,7 @@
public string HPCSNo { get; set; } // PCS鍙�
public int HPosition_x { get; set; } // PCS琛屾墍鍦ㄧ储寮�
public int HPosition_y { get; set; } // PCS鍒楁墍鍦ㄧ储寮�
- public int HSetPosition_y { get; set; }
- public int HSetPosition_x { get; set; }
+ public double HSetPosition_y { get; set; }
+ public double HSetPosition_x { get; set; }
}
}
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
index 4647ac4..1e2d123 100644
--- a/WebAPI/Models/HBarCodeList.cs
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -79,5 +79,11 @@
public string HCheckEmpName2 { get; set; } //"妫�楠屽憳鍚嶇О";
public string HZZRQ { get; set; } //鍒堕�犳棩鏈�
+ public int HReInspectionFlag { get; set; } //澶嶆鍚敤鏍囪
+ public string HInspectionDate { get; set; } //鐢熸垚鏃ユ湡
+ public int HInspectionCycle { get; set; } //澶嶆鍛ㄦ湡
+ public string HReInspectionDate { get; set; }//澶嶆鏃ユ湡
+ public string HPOOrderBillMTO { get; set; }//閲囪喘璺熻釜鍙�
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
index ca683fd..9c2f1d1 100644
--- a/WebAPI/Models/HSouceOrderList.cs
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -49,6 +49,7 @@
public string HSPName{get;set;} // "浠撲綅";
public string HInstructNo{get;set;} // "鎸囦护鍗曞彿";
public string HSeOrderBillNo{get;set;} // "閿�鍞鍗曞彿";
+ public int HSeOrderSEQ { get; set; } // "閿�鍞鍗曡鍙�";
public string HDate{get;set;} // "杩涙枡鏃ユ湡";
public string HRemark{get;set;} // "澶囨敞";
public string HMTONo{get;set;} // "璁″垝璺熻釜鍙�";
@@ -71,6 +72,7 @@
public string HFactory { get; set; } //"鍘傚晢";
public DateTime HProduceDate { get; set; } //"鐢熶骇鏃ユ湡";
public DateTime HExpiryDate { get; set; } //"淇濊川鏈熻嚦";
+ public int HISKFPERIOD { get; set; } //"淇濊川鏈熷惎鐢�";
public Int64 HGroupID { get; set; } //"鐝粍";
public string HGroupNumber { get; set; } //"鐝粍";
public string HGroupName { get; set; } //"鐝粍";
@@ -83,5 +85,14 @@
public string HZZRQ { get; set; } //鍒堕�犳棩鏈�
public string HInterID { get; set; }
+
+ public double HEXPPERIOD { get; set; } //鏈夋晥鏈熷��
+ public string HEXPUNIT { get; set; } //鏈夋晥鏈熷崟浣�(鏃ャ�佹湀銆佸勾)
+
+ public bool HReInspectionFlag { get; set; } //澶嶆鍚敤鏍囪
+ public string HInspectionDate { get; set; } //鐢熸垚鏃ユ湡
+ public int HInspectionCycle { get; set; } //澶嶆鍛ㄦ湡
+ public string HReInspectionDate { get; set; }//澶嶆鏃ユ湡
+ public string HPOOrderBillMTO { get; set; }//閲囪喘璺熻釜鍙�
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0db17d3..bf5b630 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
- <History>True|2025-12-29T06:33:00.1237682Z;True|2025-12-29T13:14:37.2747700+08:00;</History>
+ <History>True|2026-01-05T15:26:15.9058534Z;True|2026-01-05T23:10:09.2125130+08:00;True|2026-01-05T23:05:18.2406265+08:00;False|2026-01-05T23:04:03.0504675+08:00;</History>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/29/2025 13:14:16</publishTime>
+ <publishTime>01/05/2026 23:04:30</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/29/2025 13:14:16</publishTime>
+ <publishTime>01/05/2026 23:04:30</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/29/2025 13:14:11</publishTime>
+ <publishTime>01/05/2026 23:04:27</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/29/2025 13:14:11</publishTime>
+ <publishTime>01/05/2026 23:04:27</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/29/2025 13:14:05</publishTime>
+ <publishTime>01/05/2026 23:04:18</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/29/2025 13:14:05</publishTime>
+ <publishTime>01/05/2026 23:04:18</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/29/2025 13:14:09</publishTime>
+ <publishTime>01/05/2026 23:04:19</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/29/2025 13:14:09</publishTime>
+ <publishTime>01/05/2026 23:04:19</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/29/2025 13:14:01</publishTime>
+ <publishTime>01/05/2026 23:04:14</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/29/2025 13:14:01</publishTime>
+ <publishTime>01/05/2026 23:04:14</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/29/2025 13:14:03</publishTime>
+ <publishTime>01/05/2026 23:04:16</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/29/2025 13:14:03</publishTime>
+ <publishTime>01/05/2026 23:04:16</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/29/2025 13:14:03</publishTime>
+ <publishTime>01/05/2026 23:04:16</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/29/2025 13:14:03</publishTime>
+ <publishTime>01/05/2026 23:04:16</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/29/2025 09:20:32</publishTime>
+ <publishTime>01/05/2026 23:04:11</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/29/2025 09:20:32</publishTime>
+ <publishTime>01/05/2026 23:04:11</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/29/2025 09:20:32</publishTime>
+ <publishTime>01/05/2026 23:04:20</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/29/2025 09:20:32</publishTime>
+ <publishTime>01/05/2026 23:04:20</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/29/2025 14:32:51</publishTime>
+ <publishTime>01/05/2026 23:09:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/29/2025 14:32:51</publishTime>
+ <publishTime>01/05/2026 23:09:51</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/29/2025 14:32:55</publishTime>
+ <publishTime>01/05/2026 23:10:04</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,61 +312,61 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:15</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>12/15/2025 08:04:16</publishTime>
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/18/2025 16:11:19</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/18/2025 16:11:19</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/18/2025 16:11:19</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/18/2025 16:11:19</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -375,7 +375,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -384,127 +384,127 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>08/18/2025 16:11:19</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:16</publishTime>
</File>
<File Include="packages.config">
- <publishTime>12/29/2025 09:21:08</publishTime>
+ <publishTime>12/29/2025 09:02:47</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/08/2025 10:29:30</publishTime>
+ <publishTime>12/07/2025 12:01:10</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/12/2025 10:51:38</publishTime>
+ <publishTime>08/29/2025 09:43:09</publishTime>
</File>
<File Include="Utility/Barcode.ashx">
- <publishTime>12/15/2025 08:04:16</publishTime>
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
+ <publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/29/2025 13:14:35</publishTime>
+ <publishTime>01/05/2026 23:05:15</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
new file mode 100644
index 0000000..bab0a48
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -0,0 +1,517 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <History>True|2025-08-08T02:12:39.6115833Z;True|2025-08-08T10:11:05.4976467+08:00;False|2025-08-08T10:10:56.7508294+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <History>True|2026-01-04T08:46:35.3346182Z;True|2026-01-04T15:00:08.5580573+08:00;False|2026-01-04T14:59:17.3813387+08:00;True|2025-12-23T16:28:37.8115885+08:00;False|2025-12-23T16:26:46.6052762+08:00;True|2025-12-23T14:06:41.3883860+08:00;True|2025-12-23T14:00:07.6749508+08:00;True|2025-12-23T13:58:57.5577882+08:00;False|2025-12-23T13:58:07.2533327+08:00;True|2025-12-23T08:16:04.3328599+08:00;False|2025-12-23T08:15:35.8858701+08:00;True|2025-12-18T16:28:49.4312948+08:00;True|2025-12-18T15:24:26.0115244+08:00;False|2025-12-18T15:23:55.6537576+08:00;True|2025-12-08T16:11:48.7035138+08:00;False|2025-12-08T16:11:17.2590211+08:00;True|2025-12-08T15:14:21.4310723+08:00;False|2025-12-08T15:13:24.6124297+08:00;True|2025-12-01T15:20:44.9386037+08:00;False|2025-12-01T15:20:36.4207021+08:00;True|2025-11-25T10:22:20.8997856+08:00;False|2025-11-25T10:22:12.6515291+08:00;True|2025-11-07T16:34:43.8454867+08:00;True|2025-11-07T16:05:28.9073909+08:00;True|2025-11-07T16:01:49.1416161+08:00;True|2025-11-07T14:46:13.2471475+08:00;True|2025-11-07T14:19:47.9318085+08:00;False|2025-11-07T14:19:41.1003987+08:00;True|2025-11-05T16:02:11.0615592+08:00;False|2025-11-05T16:01:56.9412646+08:00;False|2025-11-05T15:53:20.8449563+08:00;True|2025-10-20T15:21:47.5140367+08:00;True|2025-10-20T14:04:18.3367894+08:00;False|2025-10-20T14:03:49.0696842+08:00;True|2025-10-17T10:00:49.9734449+08:00;False|2025-10-17T10:00:00.3400111+08:00;True|2025-10-16T14:33:50.0143974+08:00;True|2025-10-16T14:14:19.8272515+08:00;False|2025-10-16T14:13:52.8518376+08:00;True|2025-10-16T13:44:11.7580081+08:00;False|2025-10-16T13:43:40.6391342+08:00;True|2025-10-13T17:32:19.0994950+08:00;False|2025-10-13T17:31:43.3980965+08:00;True|2025-10-12T22:15:36.2044271+08:00;False|2025-10-12T22:15:05.5130292+08:00;True|2025-10-12T22:02:48.0519352+08:00;False|2025-10-12T22:02:03.0640348+08:00;False|2025-10-12T21:55:51.1042699+08:00;False|2025-10-12T21:55:25.7755321+08:00;False|2025-10-12T21:54:38.5630629+08:00;False|2025-10-12T21:54:00.2904646+08:00;False|2025-10-12T21:52:49.1718673+08:00;True|2025-09-29T14:19:56.3493999+08:00;True|2025-09-29T13:45:50.3942453+08:00;True|2025-09-29T13:42:06.1110553+08:00;True|2025-09-29T13:36:03.8122720+08:00;True|2025-09-29T08:02:25.4433936+08:00;False|2025-09-29T08:01:34.9956194+08:00;True|2025-09-28T16:32:32.1205217+08:00;False|2025-09-28T16:32:22.2949617+08:00;True|2025-09-26T14:52:29.3520681+08:00;True|2025-09-26T14:32:54.2746904+08:00;True|2025-09-26T14:30:03.3405779+08:00;True|2025-09-26T14:27:07.1365132+08:00;True|2025-09-26T14:17:38.1278517+08:00;False|2025-09-26T14:17:15.2222928+08:00;True|2025-09-26T13:27:46.3116713+08:00;True|2025-09-26T13:20:12.4936518+08:00;True|2025-09-26T10:02:30.8281583+08:00;False|2025-09-26T10:02:03.9362462+08:00;True|2025-09-26T09:53:20.0008961+08:00;True|2025-09-26T09:50:19.6692823+08:00;False|2025-09-26T09:49:53.3697350+08:00;True|2025-09-25T09:30:42.4579039+08:00;True|2025-09-25T09:28:06.6361895+08:00;True|2025-09-25T09:21:03.5626551+08:00;True|2025-09-25T09:07:49.5781444+08:00;True|2025-09-25T09:05:39.3361215+08:00;True|2025-09-25T08:57:49.0092670+08:00;True|2025-09-25T08:53:18.1932158+08:00;False|2025-09-25T08:52:41.4831686+08:00;True|2025-09-24T10:55:06.7583576+08:00;True|2025-09-24T10:42:07.4293256+08:00;True|2025-09-24T10:35:21.5131843+08:00;True|2025-09-24T10:01:34.6039507+08:00;False|2025-09-24T10:01:02.2423847+08:00;True|2025-09-23T14:10:09.5716580+08:00;False|2025-09-23T14:09:16.6824875+08:00;True|2025-09-23T10:19:03.9148941+08:00;False|2025-09-23T10:18:54.9945094+08:00;True|2025-09-22T16:10:40.3493996+08:00;True|2025-09-22T16:06:30.7648048+08:00;True|2025-09-22T15:58:01.2588123+08:00;True|2025-09-22T13:22:29.7402684+08:00;True|2025-09-22T10:50:24.6032398+08:00;True|2025-09-22T10:18:57.4239252+08:00;True|2025-09-22T09:44:34.1606021+08:00;True|2025-09-22T09:37:22.2102591+08:00;False|2025-09-22T09:37:13.3244518+08:00;False|2025-09-22T09:37:05.6707374+08:00;True|2025-09-22T09:20:00.1335697+08:00;True|2025-09-22T08:50:45.0839990+08:00;False|2025-09-22T08:50:39.5078616+08:00;True|2025-09-19T16:54:50.1840540+08:00;True|2025-09-19T15:58:56.7629702+08:00;True|2025-09-19T15:34:55.4164772+08:00;True|2025-09-19T15:19:17.0615575+08:00;False|2025-09-19T15:17:40.3055696+08:00;True|2025-09-17T16:33:38.7832139+08:00;False|2025-09-17T16:32:33.8056170+08:00;True|2025-09-15T15:31:28.0110309+08:00;True|2025-09-15T08:59:48.0264567+08:00;True|2025-09-15T08:55:35.9132476+08:00;False|2025-09-15T08:55:15.9462000+08:00;True|2025-09-10T15:37:27.9811453+08:00;True|2025-09-10T15:31:46.7985512+08:00;True|2025-09-10T15:25:13.0432246+08:00;True|2025-09-10T15:04:50.9925337+08:00;True|2025-09-10T14:45:51.9588268+08:00;True|2025-09-10T13:39:21.5732215+08:00;True|2025-09-10T13:30:34.6821425+08:00;False|2025-09-10T13:29:58.0985305+08:00;True|2025-09-10T11:09:10.4474163+08:00;True|2025-09-10T11:01:18.2664245+08:00;False|2025-09-10T11:01:11.7600095+08:00;True|2025-09-09T11:11:08.2737365+08:00;True|2025-09-09T10:48:12.8653988+08:00;True|2025-09-09T10:45:55.8371735+08:00;False|2025-09-09T10:45:50.0271007+08:00;True|2025-09-05T15:34:30.9324454+08:00;True|2025-09-05T15:25:04.5703586+08:00;True|2025-09-05T15:18:44.7836555+08:00;True|2025-09-05T15:18:15.3564889+08:00;True|2025-09-05T15:14:02.2490100+08:00;True|2025-09-05T15:13:22.0106066+08:00;True|2025-09-05T15:07:13.1733932+08:00;True|2025-09-05T14:34:49.5160527+08:00;True|2025-09-05T14:25:56.7476432+08:00;True|2025-09-05T14:11:06.6130566+08:00;True|2025-09-05T14:06:03.3723817+08:00;True|2025-09-05T13:59:08.2676824+08:00;True|2025-09-05T13:55:29.3608816+08:00;True|2025-09-05T13:50:19.1500461+08:00;True|2025-09-05T13:44:07.8244320+08:00;True|2025-09-05T13:32:55.8727194+08:00;True|2025-09-05T13:32:31.4266652+08:00;True|2025-09-05T13:29:54.4476848+08:00;True|2025-09-05T13:20:46.5358233+08:00;True|2025-09-05T13:12:44.2176702+08:00;True|2025-09-05T13:01:20.7462374+08:00;True|2025-09-05T13:00:45.2360436+08:00;True|2025-09-05T12:50:48.1213509+08:00;False|2025-09-05T12:50:41.6099269+08:00;True|2025-09-04T10:26:10.4040299+08:00;True|2025-09-04T10:22:55.8468850+08:00;True|2025-09-04T10:12:00.1744374+08:00;True|2025-09-04T10:11:20.8053602+08:00;False|2025-09-04T10:10:37.1981071+08:00;True|2025-09-03T16:53:33.7806439+08:00;True|2025-09-03T16:23:53.1760759+08:00;True|2025-09-03T16:13:51.7648089+08:00;True|2025-09-01T11:27:28.5171063+08:00;True|2025-09-01T09:10:26.2807200+08:00;True|2025-08-30T16:17:23.6280447+08:00;True|2025-08-30T16:08:45.2704012+08:00;False|2025-08-30T16:07:49.5332724+08:00;True|2025-08-29T13:42:08.9331590+08:00;True|2025-08-29T09:30:26.3865231+08:00;True|2025-08-29T09:26:59.6931531+08:00;True|2025-08-29T09:24:15.7633865+08:00;True|2025-08-29T09:20:15.7248945+08:00;True|2025-08-29T09:16:10.8305341+08:00;False|2025-08-29T09:15:37.6509149+08:00;True|2025-08-29T09:10:52.5758523+08:00;True|2025-08-29T09:07:28.0167672+08:00;True|2025-08-29T08:37:03.5161584+08:00;False|2025-08-29T08:36:22.9701878+08:00;True|2025-08-28T09:09:16.5053336+08:00;False|2025-08-28T09:08:31.8483468+08:00;True|2025-08-27T15:23:37.2451244+08:00;True|2025-08-27T14:08:19.4652541+08:00;True|2025-08-27T10:30:22.9583542+08:00;True|2025-08-27T10:24:39.3809926+08:00;True|2025-08-27T10:19:14.5440743+08:00;False|2025-08-27T10:18:22.9365507+08:00;True|2025-08-26T16:22:15.9301705+08:00;True|2025-08-26T16:15:50.6064453+08:00;False|2025-08-26T16:13:43.3734036+08:00;True|2025-08-26T10:03:33.2470619+08:00;True|2025-08-26T09:56:19.7100523+08:00;True|2025-08-26T09:51:10.1388633+08:00;True|2025-08-26T09:44:17.2173284+08:00;True|2025-08-26T09:36:15.5978463+08:00;False|2025-08-26T09:35:33.7420993+08:00;True|2025-08-25T15:01:50.5666742+08:00;True|2025-08-25T14:36:52.7376096+08:00;True|2025-08-25T14:29:34.9048354+08:00;True|2025-08-25T13:55:21.2896736+08:00;False|2025-08-25T13:53:29.3900423+08:00;True|2025-08-21T16:22:43.4480748+08:00;True|2025-08-21T16:13:59.7952292+08:00;True|2025-08-21T16:08:00.4465834+08:00;True|2025-08-21T15:47:33.0090744+08:00;False|2025-08-21T15:44:54.3140769+08:00;True|2025-08-20T13:59:43.5478179+08:00;True|2025-08-20T09:42:23.4176514+08:00;True|2025-08-20T08:58:41.0775117+08:00;False|2025-08-20T08:57:48.1366515+08:00;True|2025-08-19T16:07:02.0546263+08:00;True|2025-08-19T13:54:20.3065647+08:00;True|2025-08-19T13:04:16.6242527+08:00;False|2025-08-19T13:03:35.6928433+08:00;True|2025-08-18T13:03:14.7153952+08:00;True|2025-08-18T10:28:34.6874829+08:00;False|2025-08-18T10:22:59.8356232+08:00;True|2025-08-15T08:49:26.9915062+08:00;True|2025-08-15T08:40:21.8574257+08:00;True|2025-08-15T08:33:10.0952126+08:00;True|2025-08-12T11:00:19.2136555+08:00;True|2025-08-12T08:16:54.4308560+08:00;False|2025-08-12T08:16:20.5681009+08:00;True|2025-08-11T09:33:02.5662651+08:00;True|2025-08-11T09:29:33.8368533+08:00;True|2025-08-11T09:21:37.6200426+08:00;True|2025-08-11T09:17:43.9802106+08:00;True|2025-08-11T08:52:44.9690249+08:00;True|2025-08-11T08:26:58.0223608+08:00;False|2025-08-11T08:26:23.1079192+08:00;True|2025-08-08T15:39:38.6720210+08:00;True|2025-08-08T14:20:03.4053835+08:00;True|2025-08-08T13:13:34.5963008+08:00;False|2025-08-08T13:12:52.5341192+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <!-- <History>True|2025-05-30T12:09:45.0529442Z;True|2025-05-30T20:00:10.4746636+08:00;True|2025-05-30T19:57:36.8909388+08:00;True|2025-05-30T19:54:23.3709863+08:00;True|2025-05-30T19:45:59.1224560+08:00;True|2025-05-30T16:11:23.1078874+08:00;True|2025-05-30T15:25:44.1369253+08:00;False|2025-05-30T15:22:59.6023666+08:00;True|2025-05-29T16:10:27.4758580+08:00;True|2025-05-29T15:52:51.1913782+08:00;True|2025-05-29T15:04:09.5789210+08:00;True|2025-05-29T15:02:08.3369006+08:00;True|2025-05-29T14:56:02.6701408+08:00;True|2025-05-29T14:53:01.2526336+08:00;True|2025-05-29T14:06:14.4134236+08:00;True|2025-05-29T10:41:57.8589729+08:00;False|2025-05-29T10:39:13.1065954+08:00;True|2025-05-28T20:49:52.1040536+08:00;True|2025-05-28T20:29:58.7610235+08:00;True|2025-05-28T18:15:25.8543366+08:00;True|2025-05-28T18:08:49.2159745+08:00;True|2025-05-28T16:42:11.4418993+08:00;True|2025-05-28T16:28:22.4271997+08:00;True|2025-05-28T15:04:01.9930101+08:00;True|2025-05-28T14:59:50.5569363+08:00;False|2025-05-28T14:56:53.2197560+08:00;True|2025-05-27T18:43:26.0645332+08:00;True|2025-05-27T18:39:48.9213232+08:00;True|2025-05-27T18:31:00.6833134+08:00;True|2025-05-27T18:14:59.2401391+08:00;True|2025-05-27T18:08:30.5462780+08:00;True|2025-05-27T10:38:24.2792089+08:00;True|2025-05-27T10:35:14.0648253+08:00;True|2025-05-27T09:16:15.6299226+08:00;True|2025-05-27T09:12:14.8112320+08:00;False|2025-05-27T09:10:17.1762667+08:00;True|2025-05-26T20:46:47.2266490+08:00;True|2025-05-26T20:11:25.6943227+08:00;True|2025-05-26T20:06:54.0567323+08:00;True|2025-05-26T20:02:04.0505311+08:00;True|2025-05-26T19:52:14.7038690+08:00;False|2025-05-26T19:46:38.1383433+08:00;True|2025-05-26T14:58:12.1359700+08:00;True|2025-05-26T14:54:29.9414372+08:00;True|2025-05-26T14:50:27.3163470+08:00;True|2025-05-26T14:44:56.5112541+08:00;False|2025-05-26T14:40:09.3953370+08:00;True|2025-05-26T14:25:54.4627693+08:00;False|2025-05-26T14:24:14.2496726+08:00;True|2025-05-22T15:38:35.3926523+08:00;True|2025-05-22T15:35:00.5689883+08:00;True|2025-05-22T14:42:49.5863941+08:00;True|2025-05-22T14:36:46.1020298+08:00;True|2025-05-22T14:32:53.2788353+08:00;True|2025-05-22T14:29:17.0533776+08:00;True|2025-05-22T14:24:40.1069304+08:00;False|2025-05-22T14:23:17.8312640+08:00;True|2025-05-21T15:28:11.4510589+08:00;True|2025-05-21T15:15:40.5460368+08:00;False|2025-05-21T15:12:30.3957240+08:00;True|2025-05-20T20:28:55.1865798+08:00;True|2025-05-20T20:15:51.1649682+08:00;True|2025-05-20T20:02:38.4286705+08:00;True|2025-05-20T19:56:10.5284769+08:00;True|2025-05-20T19:45:37.6791824+08:00;False|2025-05-20T19:42:43.1477567+08:00;True|2025-05-19T15:21:07.7633659+08:00;True|2025-05-19T15:18:18.7396942+08:00;True|2025-05-19T15:13:00.1330400+08:00;True|2025-05-19T14:49:49.2534084+08:00;True|2025-05-19T14:37:59.0451180+08:00;True|2025-05-19T14:33:11.8539600+08:00;True|2025-05-19T14:27:59.3745627+08:00;True|2025-05-19T14:18:26.3913082+08:00;True|2025-05-19T14:00:37.9360187+08:00;False|2025-05-19T13:58:41.7143238+08:00;True|2025-05-12T14:57:55.0385595+08:00;True|2025-05-12T13:06:26.8782755+08:00;True|2025-05-12T12:53:08.7545688+08:00;True|2025-05-12T12:27:23.2918738+08:00;True|2025-05-12T12:14:00.1464431+08:00;True|2025-05-12T11:30:29.5971323+08:00;True|2025-05-12T11:25:21.8905995+08:00;True|2025-05-12T11:19:11.3233309+08:00;True|2025-05-12T11:06:09.4136287+08:00;True|2025-05-12T10:10:42.1771130+08:00;True|2025-05-12T10:09:14.6246190+08:00;True|2025-05-12T08:44:01.0613625+08:00;False|2025-05-12T08:42:33.7100817+08:00;True|2025-05-09T09:52:01.5341669+08:00;True|2025-05-09T09:47:27.3989887+08:00;True|2025-05-09T09:42:36.2617901+08:00;False|2025-05-09T09:40:08.0947782+08:00;True|2025-05-08T16:00:29.8759120+08:00;True|2025-05-08T13:24:39.2927841+08:00;True|2025-05-08T13:14:18.5422608+08:00;True|2025-05-08T12:47:12.7136145+08:00;True|2025-05-08T12:41:36.1177461+08:00;True|2025-05-08T12:41:04.5029523+08:00;True|2025-05-08T12:32:03.0031025+08:00;True|2025-05-08T12:00:14.8603925+08:00;True|2025-05-08T11:23:29.4928832+08:00;True|2025-05-08T11:22:57.1560531+08:00;True|2025-05-08T11:16:10.4999105+08:00;False|2025-05-08T11:14:23.0464674+08:00;True|2025-05-07T13:31:07.7140287+08:00;False|2025-05-07T13:30:22.3469816+08:00;True|2025-05-06T13:31:16.7226626+08:00;True|2025-05-06T11:05:36.8250941+08:00;True|2025-05-06T10:25:27.0035953+08:00;True|2025-05-06T09:55:27.8816646+08:00;True|2025-05-06T09:48:24.2023114+08:00;True|2025-05-06T09:36:31.5646471+08:00;True|2025-05-06T09:31:22.0639528+08:00;False|2025-05-06T09:30:02.7830632+08:00;True|2025-04-30T15:20:59.1827605+08:00;True|2025-04-30T15:14:37.3331777+08:00;True|2025-04-30T13:14:51.3154029+08:00;True|2025-04-30T13:14:15.0963455+08:00;True|2025-04-30T13:10:13.3727222+08:00;False|2025-04-30T13:06:39.8843484+08:00;False|2025-04-30T13:05:01.8963304+08:00;True|2025-04-30T10:23:53.7061459+08:00;True|2025-04-30T10:18:28.2879871+08:00;True|2025-04-30T10:14:38.6366499+08:00;True|2025-04-30T10:02:44.3278308+08:00;True|2025-04-30T09:53:29.6346041+08:00;True|2025-04-30T09:45:29.5572300+08:00;True|2025-04-30T09:14:32.0665725+08:00;True|2025-04-30T09:07:25.5826394+08:00;True|2025-04-30T09:01:28.5360494+08:00;False|2025-04-30T08:59:36.4959754+08:00;True|2025-04-29T16:32:47.7145278+08:00;True|2025-04-29T15:41:44.7116258+08:00;True|2025-04-29T15:32:49.4490248+08:00;False|2025-04-29T15:25:51.5282600+08:00;False|2025-04-29T15:23:33.1022530+08:00;True|2025-04-29T14:39:42.0427387+08:00;True|2025-04-29T14:14:37.1424704+08:00;True|2025-04-29T13:53:06.8818046+08:00;True|2025-04-29T13:38:29.5948294+08:00;True|2025-04-29T08:50:02.3834885+08:00;True|2025-04-29T08:45:53.9723523+08:00;True|2025-04-29T08:41:10.0539041+08:00;True|2025-04-29T08:40:36.8094165+08:00;True|2025-04-29T08:36:14.3169515+08:00;True|2025-04-29T08:18:50.9294272+08:00;True|2025-04-29T08:13:21.0111785+08:00;True|2025-04-29T08:08:41.1470031+08:00;False|2025-04-29T08:08:00.8674071+08:00;True|2025-04-24T14:03:47.0390589+08:00;True|2025-04-24T13:08:57.8491077+08:00;True|2025-04-24T11:15:53.7224800+08:00;True|2025-04-24T11:12:55.2113887+08:00;False|2025-04-24T11:09:59.9499198+08:00;True|2025-04-21T16:51:11.0234671+08:00;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> -->
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ <!-- <publishTime>04/21/2025 11:46:17</publishTime> -->
+ </File>
+ <File Include="BarCodeTemplate/barCodeTemplateStorage.json">
+ <publishTime>08/29/2025 08:34:20</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>01/04/2026 14:59:46</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>01/04/2026 14:59:46</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>01/04/2026 14:59:43</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>01/04/2026 14:59:43</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>01/04/2026 14:59:34</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>01/04/2026 14:59:34</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ <!-- <publishTime>04/21/2025 11:46:16</publishTime> -->
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>01/04/2026 14:59:36</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>01/04/2026 14:59:36</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>01/04/2026 14:59:31</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>01/04/2026 14:59:31</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>01/04/2026 14:59:32</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>01/04/2026 14:59:32</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>01/04/2026 14:59:32</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>01/04/2026 14:59:32</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/08/2025 16:11:23</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/08/2025 16:11:23</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>01/03/2026 09:53:01</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>01/03/2026 09:53:01</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>01/04/2026 16:46:29</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>01/04/2026 16:46:29</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>01/04/2026 16:46:34</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>07/12/2023 08:14:21</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>09/19/2024 10:10:46</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/08/2025 16:05:47</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/08/2025 16:05:47</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/01/2025 08:23:20</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/Reference.map">
+ <publishTime>05/06/2024 13:47:57</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>01/04/2026 15:00:02</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
new file mode 100644
index 0000000..9ce3c04
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+姝ゆ枃浠剁敱 Web 椤圭洰鐨勫彂甯�/鎵撳寘杩囩▼浣跨敤銆傚彲浠ラ�氳繃缂栬緫姝� MSBuild 鏂囦欢
+鑷畾涔夋杩囩▼鐨勮涓恒�備负浜嗚В涓庢鐩稿叧鐨勬洿澶氬唴瀹癸紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=208121銆�
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 5a1b5b5..2d55591 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-12-30T06:23:14.0889784Z;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2026-01-04T03:27:03.6003486Z;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/30/2025 14:23:04</publishTime>
+ <publishTime>01/04/2026 10:59:34</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/30/2025 14:23:04</publishTime>
+ <publishTime>01/04/2026 10:59:34</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/30/2025 14:23:00</publishTime>
+ <publishTime>01/04/2026 10:59:21</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/30/2025 14:23:00</publishTime>
+ <publishTime>01/04/2026 10:59:21</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/30/2025 14:22:53</publishTime>
+ <publishTime>01/04/2026 10:59:03</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/30/2025 14:22:53</publishTime>
+ <publishTime>01/04/2026 10:59:03</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/30/2025 14:22:57</publishTime>
+ <publishTime>01/04/2026 10:59:09</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/30/2025 14:22:57</publishTime>
+ <publishTime>01/04/2026 10:59:09</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/30/2025 14:22:41</publishTime>
+ <publishTime>01/04/2026 10:58:52</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/30/2025 14:22:41</publishTime>
+ <publishTime>01/04/2026 10:58:52</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/30/2025 14:22:47</publishTime>
+ <publishTime>01/04/2026 10:58:58</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/30/2025 14:22:47</publishTime>
+ <publishTime>01/04/2026 10:58:58</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/30/2025 14:22:48</publishTime>
+ <publishTime>01/04/2026 10:58:58</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/30/2025 14:22:48</publishTime>
+ <publishTime>01/04/2026 10:58:58</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/30/2025 14:19:59</publishTime>
+ <publishTime>12/30/2025 14:23:42</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/30/2025 14:19:59</publishTime>
+ <publishTime>12/30/2025 14:23:42</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/30/2025 14:17:55</publishTime>
+ <publishTime>12/30/2025 14:23:45</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/30/2025 14:17:55</publishTime>
+ <publishTime>12/30/2025 14:23:45</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/30/2025 14:23:10</publishTime>
+ <publishTime>01/04/2026 11:27:02</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/30/2025 14:23:10</publishTime>
+ <publishTime>01/04/2026 11:27:02</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
diff --git a/WebAPI/Utility/Barcode.ashx.cs b/WebAPI/Utility/Barcode.ashx.cs
index 9ed5153..d80c614 100644
--- a/WebAPI/Utility/Barcode.ashx.cs
+++ b/WebAPI/Utility/Barcode.ashx.cs
@@ -1,6 +1,6 @@
锘縰sing System;
using System.Web;
-//using grsvr6Lib;
+using grsvr6Lib;
namespace GridReport.html5
{
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index b45f246..41ca5eb 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -35,12 +35,12 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>--> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> --><!--鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <add key="surl" value="http://localhost/WEBS-WMS/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />--> <!--閲戝竻-->
- <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />-->
+ <add key="sUrl" value="http://localhost:81/MESWMS-WEBS/WebService1.asmx" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -109,13 +109,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost/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://localhost/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 6ceda4b..af48005 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -467,6 +467,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\QC_InStockCheckBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -670,6 +671,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
+ <Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1f0eb86..de2a04c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 188351a..39c19dd 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 76d2250..795d78d 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index a9cb335..35bd74a 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index c6ffdf4..2b3e479 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index 35e5324..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ /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 ea8e741..9503220 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,12 +1,11 @@
-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
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒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.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\GIT浠撳簱\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
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 188351a..39c19dd 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 76d2250..795d78d 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..0312216
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..e11a207
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,5 @@
+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
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..35bd74a
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
new file mode 100644
index 0000000..2b3e479
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1