From 5057e75e1837bcdf9e7e60de7970bf8a1d3dda92 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 09 一月 2026 12:23:23 +0800
Subject: [PATCH] 1
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LianXiang.cs | 93 +
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
WebAPI/WebAPI.csproj.user | 6
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
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 5
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml | 7
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_HuaSan.cs | 26
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 19
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/WebAPI.csproj | 2
BLL/bin/Release/Pub_Control.pdb | 0
DAL/ClsWL_YayBillMain.cs | 389 +++++++++
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 0
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
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 4
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
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
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
DBUtility/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
Model/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 36
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
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs | 4
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 172 ++--
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
DAL/bin/Release/Model.pdb | 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
Pub_Class/bin/Release/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
WebAPI/Controllers/物流管理/出运单/WLYayBillController.cs | 551 ++++++++++++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 18
DAL/DAL.csproj | 1
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 11
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 176 ++--
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 4
SQLHelper/bin/Release/Pub_Class.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 4
WarM/条码打印/Gy_BarCodeBillList.cs | 46 +
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 5
Model/bin/Release/Model.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
Model/bin/Release/Model.dll | 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 | 8
113 files changed, 2,008 insertions(+), 274 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index a67ddb6..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 71d61cc..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 4b14c66..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 d16b3c7..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 77807fd..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 1166f93..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 d8f4921..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 b4ad8e4..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 379f3da..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 fbd2379..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 2c420a4..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 b27424f..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 ded6836..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 bf79035..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 4b14c66..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 d16b3c7..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 77807fd..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 1166f93..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 d8f4921..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 b4ad8e4..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 379f3da..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 fbd2379..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 2c420a4..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 b27424f..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 ded6836..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 bf79035..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 77807fd..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 1166f93..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 379f3da..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 fbd2379..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 2c420a4..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 b27424f..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 ded6836..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 bf79035..278e1a9 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index 552e300..84a963f 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index 561c1c7..c65df75 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index 9103b7d..1d9a8a4 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index fe71e8f..fd5a993 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index ae4f855..c8139ba 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 89f77dc..3bb77bc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index d4f0c96..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 59940f0..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 77807fd..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 1166f93..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 77807fd..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 1166f93..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 d8f4921..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 b4ad8e4..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 379f3da..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 fbd2379..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 2c420a4..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 b27424f..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 ded6836..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 bf79035..278e1a9 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index d8f4921..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 b4ad8e4..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 379f3da..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 fbd2379..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 9a5be6e..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 310ad83..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 379f3da..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 fbd2379..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 2c420a4..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 b27424f..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 379f3da..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 fbd2379..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 ded6836..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 bf79035..278e1a9 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index ded6836..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 bf79035..278e1a9 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 9a5be6e..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 310ad83..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.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 7862f67..8a01250 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,12 +1,46 @@
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
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
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+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:\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
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+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
+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
+>>>>>>> 48b5decba526435c701a1c9ca4171eaa4f5e7e8e
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
new file mode 100644
index 0000000..e5dc9b8
--- /dev/null
+++ b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..bfb772c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..dd1ef6e
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,5 @@
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..c0635b3
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..ca3eca3
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
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/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index 6e4fbaa..b27f7e9 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -1282,10 +1282,10 @@
//鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁骞跺瓨鏀惧湪瀛愯〃grdList
private void Display()
{
- LogService.Write("鎵撳嵃鍒楄〃鎼滅储璇彞锛氥�恠elect * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID銆�");
+ LogService.Write("鎵撳嵃鍒楄〃鎼滅储璇彞锛氥�恠elect * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " order by HItemID銆�");
//璁剧疆妗ｆ鍒楄〃閫夐」鍗¤〃鏍兼暟鎹�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
index 596bb28..98255b8 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -1207,10 +1207,10 @@
//鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁骞跺瓨鏀惧湪瀛愯〃grdList
private void Display()
{
- LogService.Write("鎵撳嵃鍒楄〃鎼滅储璇彞锛氥�恠elect * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID銆�");
+ LogService.Write("鎵撳嵃鍒楄〃鎼滅储璇彞锛氥�恠elect * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " order by HItemID銆�");
//璁剧疆妗ｆ鍒楄〃閫夐」鍗¤〃鏍兼暟鎹�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
index 80d82dc..8808d13 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
@@ -678,8 +678,18 @@
HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value); // 鐗╂枡浠ｇ爜
HCode3 = HMaterNumber.Substring(HMaterNumber.Length - 2, 2); //鐗堟湰 鍙栫墿鏂欎唬鐮佸悗涓や綅
- //鏉＄爜鍓嶇紑 = 鐗╂枡瑙勬牸鍨嬪彿+渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�+骞存湀鏃ワ紙YYMMDD锛�
- sTMNumber = HMaterModel + "151091" + sYear + sPeriod2 + sDay;
+ if (cmbHCusName.Text.Contains("绱厜鍗庢櫤"))
+ {
+ //鏉＄爜鍓嶇紑 = 鐗╂枡瑙勬牸鍨嬪彿+渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151003'锛�+骞存湀鏃ワ紙YYMMDD锛�
+ sTMNumber = HMaterModel + "151003" + sYear + sPeriod2 + sDay;
+ }
+ //鏂板崕涓夈�佷笢鏂归�氫俊銆佺粺鍚�
+ else
+ {
+ //鏉＄爜鍓嶇紑 = 鐗╂枡瑙勬牸鍨嬪彿+渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�+骞存湀鏃ワ紙YYMMDD锛�
+ sTMNumber = HMaterModel + "151091" + sYear + sPeriod2 + sDay;
+ }
+
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
@@ -705,7 +715,7 @@
{
LSH2 = "0" + LSH2;
}
- //鏉＄爜缂栧彿 = 8浣嶇墿鏂欒鏍煎瀷鍙� + 6浣嶄緵搴斿晢浠ｇ爜锛堝浐瀹�'151091'锛�+ 6浣嶅勾鏈堟棩锛圷YMMDD锛�+ 2浣嶇増鏈� + 1浣嶅伐鍘傦紙鍥哄畾'0'锛�+ 5浣嶆祦姘村彿
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 2浣嶇増鏈� + 1浣嶅伐鍘傦紙鍥哄畾'0'锛�+ 5浣嶆祦姘村彿
TM = sTMNumber + HCode3 + "0" + LSH2;
HEntryID = j + 1;
@@ -807,7 +817,13 @@
//鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'105652'锛�
sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001105652";
}
- //鏂板崕涓夈�佺粺鍚堛�佺传鍏夊崕鏅�
+ //绱厜鍗庢櫤
+ else if (cmbHCusName.Text.Contains("绱厜鍗庢櫤"))
+ {
+ //鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151003'锛�
+ sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001151003";
+ }
+ //鏂板崕涓夈�佺粺鍚�
else
{
//鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�
@@ -839,7 +855,7 @@
LSH2 = "0" + LSH2;
}
- //鏉＄爜缂栧彿 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�+ 3浣嶆祦姘村彿
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 3浣嶆祦姘村彿
TM = sWTMNumber + LSH2;
HEntryID = j + 1;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs"
index c1bf32c..d2cf588 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs"
@@ -55,27 +55,29 @@
public const Int16 HWMinQtyCol = 33;
public const Int16 HWBQtyCol = 34;
public const Int16 HCustomQty1Col = 35;
- public const Int16 HZMinQtyCol = 36;
- public const Int16 HZBQtyCol = 37;
- public const Int16 HCustomQty2Col = 38;
- public const Int16 HProduceDateCol = 39;
- public const Int16 HExpiryDateCol = 40;
- public const Int16 HCusIDCol = 41;
- public const Int16 HCusNumberCol = 42;
- public const Int16 HCusNameCol = 43;
- public const Int16 HSourceInterIDCol = 44;
- public const Int16 HSourceEntryIDCol = 45;
- public const Int16 HSourceBillNoCol = 46;
- public const Int16 HSourceBillTypeCol = 47;
- public const Int16 HInitQtyCol = 48;
- public const Int16 HMTONoCol = 49;
- public const Int16 HISKFPERIODCol = 50;
- public const Int16 HEXPUNITCol = 51;
- public const Int16 HEXPPERIODCol = 52;
- public const Int16 HLSHCol = 53;
- public const Int16 HBaNoCol = 54;
- public const Int16 HCusModelCol = 55;
- public const Int16 HRemarkCol = 56;
+ public const Int16 HCustomQty3Col = 36;
+ public const Int16 HZMinQtyCol = 37;
+ public const Int16 HZBQtyCol = 38;
+ public const Int16 HCustomQty2Col = 39;
+ public const Int16 HCustomQty4Col = 40;
+ public const Int16 HProduceDateCol = 41;
+ public const Int16 HExpiryDateCol = 42;
+ public const Int16 HCusIDCol = 43;
+ public const Int16 HCusNumberCol = 44;
+ public const Int16 HCusNameCol = 45;
+ public const Int16 HSourceInterIDCol = 46;
+ public const Int16 HSourceEntryIDCol = 47;
+ public const Int16 HSourceBillNoCol = 48;
+ public const Int16 HSourceBillTypeCol = 49;
+ public const Int16 HInitQtyCol = 50;
+ public const Int16 HMTONoCol = 51;
+ public const Int16 HISKFPERIODCol = 52;
+ public const Int16 HEXPUNITCol = 53;
+ public const Int16 HEXPPERIODCol = 54;
+ public const Int16 HLSHCol = 55;
+ public const Int16 HBaNoCol = 56;
+ public const Int16 HCusModelCol = 57;
+ public const Int16 HRemarkCol = 58;
//
public string ModName = "85";
public string ModCaption = "鑱旀兂瀹㈡埛鏍囩鐢熸垚";
@@ -783,6 +785,7 @@
string HCustom6 = ""; //鎴愬搧鏂欏彿
double HCustomQty1 = 0; //鏁寸姣涢噸
double HCustomQty2 = 0; //鏁存爤姣涢噸
+ string HWei = ""; //灏剧/灏炬爤鏍囪
Int64 HSno = 0; //鎵规搴忓垪鍙�
string HBoxNo = ""; //鎵规鐢熸垚鍓嶇紑
string sHBaNo = ""; //鐣岄潰涓婅緭鍏ョ殑鎵规浣�
@@ -831,7 +834,7 @@
}
//
LSH = LSH + 1;
- LSH2 = ConvertToBase(ClsPub.isInt(LSH), 33);
+ LSH2 = ConvertToBase(ClsPub.isInt(LSH), 32);
while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
{
LSH2 = "0" + LSH2;
@@ -934,17 +937,28 @@
nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
for (int i = 0; i < HWBQty; i++)
{
- if (HSumQty - HWMinQty > 0)
+ if (HSumQty - HWMinQty >= 0)
{
+ HWei = "";
HSumQty = HSumQty - HWMinQty;
+ HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
}
else
{
+ HWei = "灏炬暟";
HWMinQty = HSumQty;
+ HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty3Col].Value); // 灏剧姣涢噸 鐣岄潰涓婅緭鍏�
+ if (HCustomQty1 <= 0)
+ {
+ MessageBox.Show("绗� " + ClsPub.isStrNull(grdMain.Rows[j].Cells[HSnoCol].Value) + " 琛岀墿鏂欙紝灏剧姣涢噸涓嶅厑璁稿皬浜� 0 锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
}
//
LWSH = LWSH + 1;
- LSH2 = ConvertToBase(ClsPub.isInt(LWSH), 33);
+ LSH2 = LWSH.ToString();
while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
{
LSH2 = "0" + LSH2;
@@ -987,7 +1001,6 @@
HCustom4 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom4Col].Value); // FRU 鐣岄潰涓婅緭鍏�
HCustom5 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC 鐣岄潰涓婅緭鍏�
HCustom6 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿 鐣岄潰涓婅緭鍏�
- HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
//FRU HCustom4銆丒C HCustom5銆佹垚鍝佹枡鍙� HCustom6銆佹暣绠辨瘺閲岺CustomQty1銆佹暣鏍堟瘺閲岺CustomQty2
@@ -1009,7 +1022,7 @@
") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
+ "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
- + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HWei + "'"
+ "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
@@ -1048,17 +1061,28 @@
nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
for (int i = 0; i < HZBQty; i++)
{
- if (HSumQty - HZMinQty > 0)
+ if (HSumQty - HZMinQty >= 0)
{
+ HWei = "";
HSumQty = HSumQty - HZMinQty;
+ HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
}
else
{
+ HWei = "灏炬暟";
HZMinQty = HSumQty;
+ HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty4Col].Value); // 灏炬爤姣涢噸 鐣岄潰涓婅緭鍏�
+ if (HCustomQty2 <= 0)
+ {
+ MessageBox.Show("绗� "+ClsPub.isStrNull(grdMain.Rows[j].Cells[HSnoCol].Value)+" 琛岀墿鏂欙紝灏炬爤姣涢噸涓嶅厑璁稿皬浜� 0 锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
}
//
LZSH = LZSH + 1;
- LSH2 = ConvertToBase(ClsPub.isInt(LZSH), 33);
+ LSH2 = LZSH.ToString();
while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
{
LSH2 = "0" + LSH2;
@@ -1102,7 +1126,6 @@
HCustom5 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC 鐣岄潰涓婅緭鍏�
HCustom6 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿 鐣岄潰涓婅緭鍏�
HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
- HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
//FRU HCustom4銆丒C HCustom5銆佹垚鍝佹枡鍙� HCustom6銆佹暣绠辨瘺閲岺CustomQty1銆佹暣鏍堟瘺閲岺CustomQty2
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
@@ -1123,7 +1146,7 @@
") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
+ "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
- + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HWei + "'"
+ "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
@@ -1221,7 +1244,7 @@
#region 灏嗗崄杩涘埗鏁板�艰浆鎴愭寚瀹氳繘鍒舵暟鍊硷紙num涓鸿杞崲鐨勫崄杩涜鏁板�硷紝nbase涓烘寚瀹氳繘鍒讹級
public string ConvertToBase(int num, int nbase)
{
- string chars = "0123456789ABCDEFGHJKLMNPQRSTVWXYZ";
+ string chars = "0123456789ABCDEFGHJKLMNPRSTVWXYZ"; //鏁板瓧+瀛楁瘝缁勫悎锛屽瓧姣嶄笉鍖呭惈IOQU
if (nbase < 2 || nbase > chars.Length)
return "";
int r;
@@ -1246,7 +1269,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 57; //鎬诲垪鏁�
+ grdMain.ColumnCount = 59; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1297,6 +1320,8 @@
grdMain.Columns[HCustom6Col].HeaderText = "鎴愬搧鏂欏彿";
grdMain.Columns[HCustomQty1Col].HeaderText = "鏁寸姣涢噸";
grdMain.Columns[HCustomQty2Col].HeaderText = "鏁存爤姣涢噸";
+ grdMain.Columns[HCustomQty3Col].HeaderText = "灏剧姣涢噸";
+ grdMain.Columns[HCustomQty4Col].HeaderText = "灏炬爤姣涢噸";
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
@@ -1355,6 +1380,8 @@
"," + HCustom6Col.ToString() +
"," + HCustomQty1Col.ToString() +
"," + HCustomQty2Col.ToString() +
+ "," + HCustomQty3Col.ToString() +
+ "," + HCustomQty4Col.ToString() +
"," + HRemarkCol.ToString();
//璁剧疆鍚堣鍒�
@@ -1811,6 +1838,8 @@
"," + HCustom6Col.ToString() +
"," + HCustomQty1Col.ToString() +
"," + HCustomQty2Col.ToString() +
+ "," + HCustomQty3Col.ToString() +
+ "," + HCustomQty4Col.ToString() +
"," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
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 3d3e923..89500ec 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"
@@ -2893,10 +2893,12 @@
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.HInspectionDate = ordrlist[i].HInspectionDate;
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);
+ barcode.HPOOrderBillMTO = DBUtility.ClsPub.isStrNull(ordrlist[i].HPOOrderBillMTO);
+ barcode.HSeOrderBillNo2 = DBUtility.ClsPub.isStrNull(ordrlist[i].HSeOrderBillNo);
+ barcode.HCusModel2 = DBUtility.ClsPub.isStrNull(ordrlist[i].HCusModel);
ListRows.Add(barcode);
n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
@@ -2973,6 +2975,7 @@
string HReInspectionDate = ListRows[i].HInspectionDate;
string HCustomBatchNo = ClsPub.isStrNull(ListRows[i].HInspectionDate).Replace("-","");
string HBarCodeStatus = "姝ｅ父";
+ string HPOOrderBillNoMTO = ClsPub.isStrNull(ListRows[i].HPOOrderBillMTO);
string sql_produceBarCode = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
@@ -2982,7 +2985,7 @@
",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" +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HCustomBatchNo,HBarCodeStatus,HOrderBillNo" +
",HReInspectionFlag,HInspectionDate,HInspectionCycle,HReInspectionDate " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
@@ -2993,7 +2996,7 @@
+ ", " + 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 + "'" +
+ + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HCustomBatchNo + "','" + HBarCodeStatus + "','" + HPOOrderBillNoMTO + "'" +
"," + HReInspectionFlag + "," + (HInspectionDate == null ? "null" : "'" + HInspectionDate + "'") + "," + HInspectionCycle + "," + (HReInspectionDate == null ? "null" : "'" + HReInspectionDate + "'") +
")";
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 fcbdeb2..865ad5c 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -101,7 +101,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," +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor, HMidBoxSize, HVolume, HNetWeight," +
"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 + "'" +
@@ -114,7 +114,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.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.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')");
oCn.RunProc("Insert into Gy_Material (" +
"HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
@@ -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/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/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 beee6ce..2db6e0f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-01-05T01:56:58.7459126Z;False|2026-01-05T09:56:50.7744167+08:00;True|2026-01-04T19:41:03.3384229+08:00;True|2026-01-04T18:38:42.0727166+08:00;False|2026-01-04T18:38:27.9765366+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2026-01-06T02:53:31.3630500Z;True|2026-01-06T10:41:35.6408400+08:00;True|2026-01-06T10:22:33.1369055+08:00;False|2026-01-06T10:22:23.4143577+08:00;True|2026-01-05T13:00:09.7525819+08:00;True|2026-01-05T09:56:58.7459126+08:00;False|2026-01-05T09:56:50.7744167+08:00;True|2026-01-04T19:41:03.3384229+08:00;True|2026-01-04T18:38:42.0727166+08:00;False|2026-01-04T18:38:27.9765366+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">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>01/05/2026 09:56:31</publishTime>
+ <publishTime>01/06/2026 10:52:55</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/05/2026 09:56:31</publishTime>
+ <publishTime>01/06/2026 10:52:55</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/05/2026 09:56:30</publishTime>
+ <publishTime>01/06/2026 10:52:52</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/05/2026 09:56:30</publishTime>
+ <publishTime>01/06/2026 10:52:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/05/2026 09:56:25</publishTime>
+ <publishTime>01/06/2026 10:52:45</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/05/2026 09:56:25</publishTime>
+ <publishTime>01/06/2026 10:52:45</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>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>01/05/2026 09:56:26</publishTime>
+ <publishTime>01/06/2026 10:52:46</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/05/2026 09:56:26</publishTime>
+ <publishTime>01/06/2026 10:52:46</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>01/05/2026 09:56:23</publishTime>
+ <publishTime>01/06/2026 10:52:42</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/05/2026 09:56:23</publishTime>
+ <publishTime>01/06/2026 10:52:42</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/05/2026 09:56:24</publishTime>
+ <publishTime>01/06/2026 10:52:43</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/05/2026 09:56:24</publishTime>
+ <publishTime>01/06/2026 10:52:43</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/05/2026 09:56:24</publishTime>
+ <publishTime>01/06/2026 10:52:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/05/2026 09:56:24</publishTime>
+ <publishTime>01/06/2026 10:52:43</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/05/2026 09:56:22</publishTime>
+ <publishTime>01/06/2026 10:52:40</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/05/2026 09:56:22</publishTime>
+ <publishTime>01/06/2026 10:52:40</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>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/05/2026 09:56:26</publishTime>
+ <publishTime>01/06/2026 10:52:44</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/05/2026 09:56:26</publishTime>
+ <publishTime>01/06/2026 10:52:44</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/05/2026 09:56:40</publishTime>
+ <publishTime>01/06/2026 10:53:08</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/05/2026 09:56:40</publishTime>
+ <publishTime>01/06/2026 10:53:08</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
@@ -312,61 +312,61 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>01/04/2026 18:33:49</publishTime>
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</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>07/12/2023 08:14:21</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/04/2026 18:33:49</publishTime>
+ <publishTime>12/30/2025 14:17:55</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/08/2025 16:05:47</publishTime>
+ <publishTime>12/10/2025 17:08:59</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/01/2025 08:23:20</publishTime>
+ <publishTime>09/05/2025 16:16:48</publishTime>
</File>
<File Include="Utility/Barcode.ashx">
- <publishTime>01/04/2026 18:33:49</publishTime>
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/05/2026 09:56:56</publishTime>
+ <publishTime>01/06/2026 10:53:28</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
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 a9b98d7..4d71647 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -9,7 +9,11 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
+<<<<<<< HEAD
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+=======
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> 48b5decba526435c701a1c9ca4171eaa4f5e7e8e
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 23913f6..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 2951c47..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.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 70c98f4..cc76324 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,12 +1,28 @@
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
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
+>>>>>>> 17752a6ca5434cac875b98272c9bc7534ae4a059
+>>>>>>> 48b5decba526435c701a1c9ca4171eaa4f5e7e8e
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