From bd2d1fb06fe96c991447d87d366e0f7f3024da79 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 23 十二月 2021 15:44:26 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 6
WebAPI/Controllers/工资管理/Gy_ClassTimePrjBillController.cs | 349 +++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 151 +-
WebAPI/Models/ClsSc_ProcessReportMain.cs | 33
WebAPI/Models/工资管理/ClsGy_GroupEmpListMain.cs | 12
WebAPI/Models/工资管理/ClsGy_GroupEmpListSub.cs | 12
WebAPI/Models/ClsSc_ProcessReportSub.cs | 69 +
WebAPI/Controllers/ProductInController.cs | 94 ++
WebAPI/Models/基础资料/Gy_ClassTimePrjSub.cs | 2
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 544 ++++++-----
WarM/条码打印/Gy_BarCodeBill.cs | 118 ++
DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs | 35
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/WebServer.cs | 35
WebAPI/Models/工资管理/ClsGy_ClassTimePrj_Model.cs | 13
LMES/bin/x86/Debug.rar | 0
DAL/源单/Cls_S_Xt_BaseBill.cs | 57 +
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 5
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 0
WebAPI/Controllers/WebAPIController.cs | 39
WebAPI/Models/基础资料/Gy_Employee.cs | 2
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs | 263 +++++
WebAPI/DLL/工资管理/ClsGy_GroupEmpBill.cs | 106 ++
Model/obj/Release/Model.csprojAssemblyReference.cache | 0
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 94 +
DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs | 64 +
WebAPI/Controllers/生产管理/报工台工序/Sc_MESProductReportStepBillController.cs | 8
WebAPI/DLL/ClsSc_ProcessReport.cs | 45
/dev/null | 386 --------
WebAPI/ListModels.cs | 40
WebAPI/Controllers/SellOutController.cs | 85 +
WarM/条码打印/Gy_BarCodeBill.designer.cs | 61
WebAPI/Controllers/Sc_ProcessMangementController.cs | 4
WebAPI/WebAPI.csproj | 19
36 files changed, 1,965 insertions(+), 788 deletions(-)
diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
index a2890db..938647e 100644
--- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
+++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
@@ -14,6 +14,41 @@
+ //宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0
+ public bool DeleteICStockBillAndWMS(Int64 sHInterID, string sHBillNo, string sHBillType, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ oCn.BeginTran();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + sHInterID + ",'" + sHBillNo + "','" + sHBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鎾ら攢鍗曟嵁澶辫触锛屾暟鎹簱杩炴帴澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ oCn.Commit();
+ return true;
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+
//鍒ゆ柇鏉＄爜 鍏ュ簱鏁伴噺鏄惁瓒呰繃鏉＄爜鏈韩棰濆畾鏁伴噺
public bool IsBarCode(string sBarCode, string sBillType, bool sRedBlueFlag, ref double sQty, ref string sReturn)
{
diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
index 55bbd3d..204ff44 100644
--- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
+++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
@@ -25,6 +25,70 @@
//
+ #region 鍗曟嵁鍒楄〃鏁版嵁澶勭悊
+
+ //鏄剧ず鐗╂枡鏄庣粏鍒楄〃銆佹ā娌诲叿鍒楄〃銆佸厛杩涘厛鍑哄垪琛ㄤ俊鎭�
+ public DataSet GetBillEntry_TmpList(long HInterID, string HBillNo, string HBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ string sSimpleMode = "N"; //鏄惁鍚敤鎵爜绠�鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N)
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涜繑鍥炵墿鏂欐槑缁嗗垪琛ㄦ椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return null;
+ }
+
+ //鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊(Y,N)
+ if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //鍚敤妯℃不鍏风鐞�
+ {
+ sMouldManagerCtl = "Y";
+ }
+ //鍒ゆ柇鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊(Y,N)锛屾槸鍚﹀惎鐢ㄦ壂鐮佺畝鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N)
+ if (HBillType == "1204") //鐢熶骇棰嗘枡鍗�
+ {
+ if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y") //鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+ if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //鐢熶骇棰嗘枡鍗�-鎵爜绠�鏄撴ā寮�
+ {
+ sSimpleMode = "Y";
+ }
+ }
+ if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y") //閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+ if (HBillType == "1211" && oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y") //濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList");
+ return DS;
+ }
+
+
+ #endregion
+
+
+ public DataSet GetKf_ICStockBillList(string sHBillType, string sHMaker, Int64 sHOWNERID)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillList '" + sHBillType + "','" + sHMaker + "'," + sHOWNERID.ToString(), "h_p_Kf_ICStockBillList");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return Ds;
+ }
+ }
+
//鎵弿鏉＄爜杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃淇℃伅
public DataSet GetInfoByID_View(long HInterID, string sBillType, string sWhere)
{
diff --git "a/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs" "b/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
index 2c3f12d..027945d 100644
--- "a/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
+++ "b/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
@@ -25,7 +25,8 @@
public string sOrderSql2 = "";
public string sKeyCol2 = "";
public string sShowItemSql2 = "";
- public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList();
+ public frmHlpBillList oFrm;
+ //public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList();
public List<DBUtility.BillSelect> oBillSelectColl = new List<DBUtility.BillSelect>();
public List<DBUtility.BillSelect_A3> oBillSelectColl2 = new List<DBUtility.BillSelect_A3>();
//
@@ -53,6 +54,7 @@
tSQL = sWhere + sCondtion + sOrderSql;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol;
oFrm.Text = mvarReportTitle;
oFrm.lblCaption.Text = mvarReportTitle;
@@ -112,6 +114,7 @@
tSQL = sWhere + sCondtion2 + sOrderSql2;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol2;
oFrm.Text = mvarReportTitle2;
oFrm.lblCaption.Text = mvarReportTitle2;
@@ -168,6 +171,7 @@
tSQL = sWhere + sCondtion2 + sOrderSql2;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol2;
oFrm.Text = mvarReportTitle2;
oFrm.lblCaption.Text = mvarReportTitle2;
@@ -257,6 +261,7 @@
tSQL = sWhere + sCondtion + sOrderSql;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol;
oFrm.Text = mvarReportTitle;
oFrm.lblCaption.Text = mvarReportTitle;
@@ -295,6 +300,56 @@
return true;
}
+ //鏍规嵁婧愬崟鍙� 妯℃嫙鏌ヨ鏁版嵁
+ /// <summary>
+ /// 鏄剧ず鏁版嵁
+ /// </summary>
+ /// <param name="sWhere">涓籗QL</param>
+ /// <param name="sCondtion">杩囨护鏉′欢</param>
+ /// <param name="sOrderSql">鎺掑簭鏉′欢</param>
+ /// <param name="sKeyCol">涓嶅彲閲嶅鍒�</param>
+ /// <returns></returns>
+ public virtual bool RefreshBySourceBillNo(string sWhere)
+ {
+ string sErr = "";
+ string tSQL;
+ ClsCN oCn = new ClsCN();
+ tSQL = " select hmainid,hsubid,鍗曟嵁鍙� from " + ViewName + sWhere + sOrderSql;
+ try
+ {
+ DataSet ds = oCn.RunProcReturn(tSQL, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return false;
+ }
+ //杩斿洖鏁版嵁鍒伴泦鍚堜腑
+ oBillSelectColl.Clear();
+
+ //寰幆 閫変腑琛�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ BillSelect oSelect = new BillSelect();
+ oSelect.BillNo = ClsPub.isStrNull(ds.Tables[0].Rows[i]["鍗曟嵁鍙�"]);
+ oSelect.BillMainID = ClsPub.isLong(ds.Tables[0].Rows[i]["hmainid"]);
+ oSelect.BillSubID = ClsPub.isLong(ds.Tables[0].Rows[i]["hsubid"]);
+ oSelect.BillTitle = mvarReportTitle;
+ oSelect.BillType = mvarItemKey;
+ oBillSelectColl.Add(oSelect);
+ }
+ //
+ if (oBillSelectColl.Count > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception e)
+ {
+ sErr = e.Message;
+ }
+ return true;
+ }
+
+
}
}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 9f5519e..a1123a1 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.csprojAssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
index 07206dc..7bf5a5e 100644
--- a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
diff --git a/LMES/bin/x86/Debug.rar b/LMES/bin/x86/Debug.rar
index de17e07..b0d896f 100644
--- a/LMES/bin/x86/Debug.rar
+++ b/LMES/bin/x86/Debug.rar
Binary files differ
diff --git a/Model/obj/Release/Model.csprojAssemblyReference.cache b/Model/obj/Release/Model.csprojAssemblyReference.cache
new file mode 100644
index 0000000..0a0fd3c
--- /dev/null
+++ b/Model/obj/Release/Model.csprojAssemblyReference.cache
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 1f079d0..70246ba 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -812,6 +812,11 @@
omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //报工台，工序汇报自动审核参数
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
}
sReturn = "显示单据成功！";
return true;
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index fe5c2e7..7ced917 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -221,6 +221,8 @@
public string Sc_MaterToSourceBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
//异常反馈单
public string OA_ErrMsgBackBill_AutoCheck; //自动审核
+ //报工台工序汇报
+ public string Sc_MESProceReportWorkBill_AutoCheck; //自动审核
//QMS
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index bf863fe..7987c2b 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1832,7 +1832,14 @@
//grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (cmbHBarCodeType.Text == "鎵规鏉＄爜" && CampanyName == "鍗氭棩绉戞妧")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1882,7 +1889,14 @@
grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (cmbHBarCodeType.Text == "鎵规鏉＄爜" && CampanyName == "鍗氭棩绉戞妧")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�"|| cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
|| cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
@@ -2505,6 +2519,106 @@
}
}
+ private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+ {
+ long sHOrgID = -1;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+ {
+ sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ }
+
+ if (txtHSourceBillNo.Text.Length < 4)
+ {
+ MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+ return;
+ }
+ //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
+ if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
+ if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+ {
+ DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
+ if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POInStockBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
+ {
+ DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
+ if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
+ {
+ DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
+ if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+ return;
+ }
+
+ }
+ }
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index c63493e..167abf2 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -51,6 +51,8 @@
this.tb = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.gl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.BatchNo = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.lblCaption = new System.Windows.Forms.Label();
@@ -67,7 +69,7 @@
this.label1 = new System.Windows.Forms.Label();
this.cmdHEmpID = new System.Windows.Forms.Button();
this.cmdSourceBillNo = new System.Windows.Forms.Button();
- this.textBox2 = new System.Windows.Forms.TextBox();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label();
@@ -104,8 +106,6 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.BatchNo = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -374,6 +374,25 @@
this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.gl.Click += new System.EventHandler(this.gl_Click);
//
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // BatchNo
+ //
+ this.BatchNo.AutoSize = false;
+ this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+ this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+ this.BatchNo.Name = "BatchNo";
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
+ this.BatchNo.Text = "鎵规";
+ this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
+ //
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -438,7 +457,7 @@
this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.cmdHEmpID);
this.gbUp.Controls.Add(this.cmdSourceBillNo);
- this.gbUp.Controls.Add(this.textBox2);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
@@ -547,13 +566,14 @@
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
//
- // textBox2
+ // txtHSourceBillNo
//
- this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textBox2.Location = new System.Drawing.Point(394, 46);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(166, 21);
- this.textBox2.TabIndex = 41;
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSourceBillNo.TabIndex = 41;
+ this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
// label14
//
@@ -965,25 +985,6 @@
this.grdList.Size = new System.Drawing.Size(929, 288);
this.grdList.TabIndex = 46;
//
- // BatchNo
- //
- this.BatchNo.AutoSize = false;
- this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
- this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
- this.BatchNo.Name = "BatchNo";
- this.BatchNo.Size = new System.Drawing.Size(36, 47);
- this.BatchNo.Text = "鎵规";
- this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
- //
- // toolStripSeparator7
- //
- this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
- //
// Gy_BarCodeBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1068,7 +1069,7 @@
private System.Windows.Forms.Label label10;
private System.Windows.Forms.ComboBox cmbSourceBillType;
private System.Windows.Forms.Button cmdSourceBillNo;
- private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
deleted file mode 100644
index 3c31a73..0000000
--- a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
+++ /dev/null
@@ -1,386 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-namespace WebAPI.Controllers
-{
- public class Gy_ClassTimePrjController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where 1=1 ", "h_v_Gy_ClassTimePrjList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1=1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
-
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjListDetail where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjListDetail");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- //
-
-
-
- /// <summary>
- ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- /////鍙傛暟锛歴tring sql銆�
- /////杩斿洖鍊硷細object銆�
- ///// </summary>
- //[Route("Gy_ClassTimePrj/AddNew")]
- //[HttpPost]
- //public object AddNew([FromBody] JObject oMain)
- //{
- // try
- // {
- // var _value = oMain["oMain"].ToString();
- // string msg1 = _value.ToString();
- // //鍙嶅簭鍒楀寲
- // msg1 = "[" + msg1.ToString() + "]";
-
- // DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- // DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
- // List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg1);
-
- // long HItemID = list[0].HItemID;
- // string HNumber = list[0].HNumber;
- // string HName = list[0].HName;
- // long hparentid = list[0].hparentid; ;
- // long HDeptID = list[0].HDeptID; ;
- // long HGroupID = list[0].HGroupID;
- // bool HStopflag = list[0].HStopflag;
- // string HRemark = list[0].HRemark;
-
- // if (!DBUtility.ClsPub.AllowNumber(HNumber))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- // oCN.BeginTran();
- // //涓昏〃
- // oCN.RunProc("Insert into Gy_ClassTimePrj" +
- // " (HNumber,HName,HParentID" +
- // ",HStopflag,HRemark,HDeptID,HGroupID) " +
- // " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
- // "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
- // , ref DBUtility.ClsPub.sExeReturnInfo);
- // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- // oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- // oCN.Commit();
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- // //objJsonResult.data = null;
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
-
- /// <summary>
- /// 淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_ClassTimePrj/ModifyByID")]
- [HttpPost]
- public object ModifyByID([FromBody] JObject oMain)
- {
- try
- {
- DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
- DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
-
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
- //鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg2);
-
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- long hparentid = list[0].hparentid; ;
- long HDeptID = list[0].HDeptID; ;
- long HGroupID = list[0].HGroupID;
- bool HStopflag = list[0].HStopflag;
- string HRemark = list[0].HRemark;
-
- ////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- //if (!DBUtility.ClsPub.AllowNumber(HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- //if (oDept.HavSameNumber(HItemID, HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
- {
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_ClassTimePrj" +
- " (HNumber,HName,hparentid" +
- ",HStopflag,HRemark,HDeptID,HGroupID) " +
- " Values('" + HNumber + "','" + HName + "'," + hparentid.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
- , ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else {
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_ClassTimePrj set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",hparentid=" + hparentid.ToString() +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- ",HDeptID=" + HDeptID.ToString() +
- ",HGroupID=" + HGroupID.ToString() +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrj set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- //
- oCN.Commit();
- }
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- /// <summary>
- /// 浠撳簱鍒楄〃鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetGy_ClassTimePrj")]
- [HttpGet]
- public object DeltetGy_ClassTimePrj(string HItemID)
- {
- DataSet ds;
- DataSet ds1;
- try
- {
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (string.IsNullOrWhiteSpace(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_ClassTimePrj where HItemID=" + HItemID, "Gy_ClassTimePrj");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_ClassTimePrj Where HParentID='" + HItemID + "'", "Gy_ClassTimePrj");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
- if (HUseFlag == "宸蹭娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- oCN.RunProc("delete from Gy_ClassTimePrj where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult; ;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index c17c107..e6ffb06 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -58,191 +58,191 @@
}
}
- /// <summary>
- /// 鏂板鑱屽憳-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Employee/AddNew")]
- [HttpPost]
- public object AddNew([FromBody] JObject oMain)
- {
- try
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ ///// <summary>
+ ///// 鏂板鑱屽憳-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_Employee/AddNew")]
+ //[HttpPost]
+ //public object AddNew([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
- DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
- List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg1);
+ // DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
+ // DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
+ // List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg1);
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
- long HLevel = 1;
- string HHelpCode = list[0].HHelpCode;
- bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
- string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
- string HSex = list[0].HSex;
- string HIDCard = list[0].HIDCard;
- string HBirthDay = list[0].HBirthDay;
- string HAddress = list[0].HAddress;
- string HLinkPhone = list[0].HLinkPhone;
- string HMobilePhone = list[0].HMobilePhone;
- string HFax = list[0].HFax;
- string HPostalCode = list[0].HPostalCode;
- string HEmail = list[0].HEmail;
- string HBank = list[0].HBank;
- string HBankAccount = list[0].HBankAccount;
- long HGroupID = list[0].HGroupID;
- long HDeptID = list[0].HDeptID;
- long HPostID = list[0].HPostID;
- long HWorkTypeID = list[0].HWorkTypeID;
- long HCTPrjID = list[0].HCTPrjID;
- long HProcID = list[0].HProcID;
- string HBasePay = list[0].HBasePay;
- DateTime HInComDate = list[0].HInComDate;
- DateTime HDimissionDate = list[0].HDimissionDate;
- bool HOverType = list[0].HOverType;
- string HEmpType = list[0].HEmpType;
- string HOtherDeduct3 = list[0].HOtherDeduct3;
- string HDrydock = list[0].HDrydock;
- string HInsurance = list[0].HInsurance;
- string HMedicare = list[0].HMedicare;
- bool HNoBrushFlag = list[0].HNoBrushFlag;
- bool HShiftFlag = list[0].HShiftFlag;
- DateTime HContactDate = list[0].HContactDate;
- bool HStopwagesFlag = list[0].HStopwagesFlag;
- string HDimissionReason = list[0].HDimissionReason;
- long HDormID = list[0].HDormID;
- string HArchivesNo = list[0].HArchivesNo;
- DateTime HStayCardEDate = list[0].HStayCardEDate;
- DateTime HCheckCardEDate = list[0].HCheckCardEDate;
- string HJobCardNo = list[0].HJobCardNo;
- DateTime HJobCardEDate = list[0].HJobCardEDate;
- string HWorkType = list[0].HWorkType;
- long HContractYear = list[0].HContractYear;
- DateTime HContractBDate = list[0].HContractBDate;
- DateTime HContractEDate = list[0].HContractEDate;
- string HInsuranceNo = list[0].HInsuranceNo;
- DateTime HInsuranceDate = list[0].HInsuranceDate;
- string HInsuranceStatus = list[0].HInsuranceStatus;
- DateTime HSignDate = list[0].HSignDate;
- bool HSignStatus = list[0].HSignStatus;
- string HOldCompany = list[0].HOldCompany;
- string HMarr = list[0].HMarr;
- string HHomeAdd = list[0].HHomeAdd;
- string HNowAdd = list[0].HNowAdd;
- string HSpec = list[0].HSpec;
- string HCompLev = list[0].HCompLev;
- string HEngLev = list[0].HEngLev;
- DateTime HGradDate = list[0].HGradDate;
- string HGradSchool = list[0].HGradSchool;
- string HSalaryLev = list[0].HSalaryLev;
- long HDutyID = list[0].HDutyID;
- string HProTitleID = list[0].HProTitleID;
- string HKnowLev = list[0].HKnowLev;
- string HAvoird = list[0].HAvoird;
- string HStature = list[0].HStature;
- string HBloodType = list[0].HBloodType;
- string HBlightyType = list[0].HBlightyType;
- string HGovStatus = list[0].HGovStatus;
- string HNation = list[0].HNation;
- string HBlighty = list[0].HBlighty;
- long HAge = list[0].HAge;
- string HExamLevPostMoney = list[0].HExamLevPostMoney;
- string HBSTDeptID = list[0].HBSTDeptID;
- string HRelDate = list[0].HRelDate;
- string HHighestPay = list[0].HHighestPay;
- string HOverPayRate = list[0].HOverPayRate;
- string HLeftMoneyRate = list[0].HLeftMoneyRate;
- string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
- string HPayType = list[0].HPayType;
- string HStdDayTimes = list[0].HStdDayTimes;
- string HStdDayPay = list[0].HStdDayPay;
- string HMinDayPay = list[0].HMinDayPay;
- string HMinMonthPay = list[0].HMinMonthPay;
- DateTime HMadeDate = list[0].HMadeDate;
- string HEmpRate = list[0].HEmpRate;
- string HExamRate = list[0].HExamRate;
- DateTime HHealthCardEDate = list[0].HHealthCardEDate;
+ // long HItemID = list[0].HItemID;
+ // string HNumber = list[0].HNumber;
+ // string HName = list[0].HName;
+ // string HShortNumber = list[0].HNumber;
+ // long HParentID = list[0].HParentID;
+ // long HLevel = 1;
+ // string HHelpCode = list[0].HHelpCode;
+ // bool HEndFlag = list[0].HEndFlag;
+ // bool HStopflag = list[0].HStopflag;
+ // string HRemark = list[0].HRemark;
+ // string HUseFlag = list[0].HUseFlag;
+ // string HSex = list[0].HSex;
+ // string HIDCard = list[0].HIDCard;
+ // string HBirthDay = list[0].HBirthDay;
+ // string HAddress = list[0].HAddress;
+ // string HLinkPhone = list[0].HLinkPhone;
+ // string HMobilePhone = list[0].HMobilePhone;
+ // string HFax = list[0].HFax;
+ // string HPostalCode = list[0].HPostalCode;
+ // string HEmail = list[0].HEmail;
+ // string HBank = list[0].HBank;
+ // string HBankAccount = list[0].HBankAccount;
+ // long HGroupID = list[0].HGroupID;
+ // long HDeptID = list[0].HDeptID;
+ // long HPostID = list[0].HPostID;
+ // long HWorkTypeID = list[0].HWorkTypeID;
+ // long HCTPrjID = list[0].HCTPrjID;
+ // long HProcID = list[0].HProcID;
+ // string HBasePay = list[0].HBasePay;
+ // DateTime HInComDate = list[0].HInComDate;
+ // DateTime HDimissionDate = list[0].HDimissionDate;
+ // bool HOverType = list[0].HOverType;
+ // string HEmpType = list[0].HEmpType;
+ // string HOtherDeduct3 = list[0].HOtherDeduct3;
+ // string HDrydock = list[0].HDrydock;
+ // string HInsurance = list[0].HInsurance;
+ // string HMedicare = list[0].HMedicare;
+ // bool HNoBrushFlag = list[0].HNoBrushFlag;
+ // bool HShiftFlag = list[0].HShiftFlag;
+ // DateTime HContactDate = list[0].HContactDate;
+ // bool HStopwagesFlag = list[0].HStopwagesFlag;
+ // string HDimissionReason = list[0].HDimissionReason;
+ // long HDormID = list[0].HDormID;
+ // string HArchivesNo = list[0].HArchivesNo;
+ // DateTime HStayCardEDate = list[0].HStayCardEDate;
+ // DateTime HCheckCardEDate = list[0].HCheckCardEDate;
+ // string HJobCardNo = list[0].HJobCardNo;
+ // DateTime HJobCardEDate = list[0].HJobCardEDate;
+ // string HWorkType = list[0].HWorkType;
+ // long HContractYear = list[0].HContractYear;
+ // DateTime HContractBDate = list[0].HContractBDate;
+ // DateTime HContractEDate = list[0].HContractEDate;
+ // string HInsuranceNo = list[0].HInsuranceNo;
+ // DateTime HInsuranceDate = list[0].HInsuranceDate;
+ // bool HInsuranceStatus = list[0].HInsuranceStatus;
+ // DateTime HSignDate = list[0].HSignDate;
+ // bool HSignStatus = list[0].HSignStatus;
+ // string HOldCompany = list[0].HOldCompany;
+ // string HMarr = list[0].HMarr;
+ // string HHomeAdd = list[0].HHomeAdd;
+ // string HNowAdd = list[0].HNowAdd;
+ // string HSpec = list[0].HSpec;
+ // string HCompLev = list[0].HCompLev;
+ // string HEngLev = list[0].HEngLev;
+ // DateTime HGradDate = list[0].HGradDate;
+ // string HGradSchool = list[0].HGradSchool;
+ // string HSalaryLev = list[0].HSalaryLev;
+ // long HDutyID = list[0].HDutyID;
+ // string HProTitleID = list[0].HProTitleID;
+ // string HKnowLev = list[0].HKnowLev;
+ // string HAvoird = list[0].HAvoird;
+ // string HStature = list[0].HStature;
+ // string HBloodType = list[0].HBloodType;
+ // string HBlightyType = list[0].HBlightyType;
+ // string HGovStatus = list[0].HGovStatus;
+ // string HNation = list[0].HNation;
+ // string HBlighty = list[0].HBlighty;
+ // long HAge = list[0].HAge;
+ // string HExamLevPostMoney = list[0].HExamLevPostMoney;
+ // string HBSTDeptID = list[0].HBSTDeptID;
+ // string HRelDate = list[0].HRelDate;
+ // string HHighestPay = list[0].HHighestPay;
+ // string HOverPayRate = list[0].HOverPayRate;
+ // string HLeftMoneyRate = list[0].HLeftMoneyRate;
+ // string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
+ // string HPayType = list[0].HPayType;
+ // string HStdDayTimes = list[0].HStdDayTimes;
+ // string HStdDayPay = list[0].HStdDayPay;
+ // string HMinDayPay = list[0].HMinDayPay;
+ // string HMinMonthPay = list[0].HMinMonthPay;
+ // DateTime HMadeDate = list[0].HMadeDate;
+ // string HEmpRate = list[0].HEmpRate;
+ // string HExamRate = list[0].HExamRate;
+ // DateTime HHealthCardEDate = list[0].HHealthCardEDate;
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ // if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_Employee (" +
- "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
- ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
- ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
- ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
- ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
- ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
- ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
- ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
- ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
- ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
- ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
- ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
- ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
- ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
- ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
- ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
- ") " +
- " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
- "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
- ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
- ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
- "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
- ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
- ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
- ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
- ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
- ",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
- ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
- "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
- ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
- ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
- "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
- ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" +
- ")");
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Employee set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // oCN.RunProc("Insert into Gy_Employee (" +
+ // "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
+ // ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
+ // ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
+ // ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
+ // ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
+ // ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
+ // ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
+ // ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
+ // ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
+ // ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
+ // ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
+ // ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
+ // ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
+ // ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
+ // ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
+ // ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
+ // ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
+ // ") " +
+ // " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
+ // "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
+ // "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
+ // ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
+ // ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
+ // "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
+ // ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
+ // ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
+ // ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
+ // ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
+ // ",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
+ // ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
+ // "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
+ // ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
+ // ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
+ // "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
+ // ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" +
+ // ")");
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // oCN.RunProc("Update Gy_Employee set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ // //objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
/// <summary>
/// 淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -274,22 +274,22 @@
string HShortNumber = list[0].HNumber;
long HParentID = list[0].HParentID;
long HLevel = 1;
- string HHelpCode = list[0].HHelpCode;
+ string HHelpCode = list[0].HHelpCode ?? "";
bool HEndFlag = list[0].HEndFlag;
bool HStopflag = list[0].HStopflag;
string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
+ string HUseFlag = list[0].HUseFlag ?? "";
string HSex = list[0].HSex;
string HIDCard = list[0].HIDCard;
string HBirthDay = list[0].HBirthDay;
- string HAddress = list[0].HAddress;
+ string HAddress = list[0].HAddress ?? "";
string HLinkPhone = list[0].HLinkPhone;
string HMobilePhone = list[0].HMobilePhone;
string HFax = list[0].HFax;
string HPostalCode = list[0].HPostalCode;
string HEmail = list[0].HEmail;
- string HBank = list[0].HBank;
- string HBankAccount = list[0].HBankAccount;
+ string HBank = list[0].HBank ?? "";
+ string HBankAccount = list[0].HBankAccount ?? "";
long HGroupID = list[0].HGroupID;
long HDeptID = list[0].HDeptID;
long HPostID = list[0].HPostID;
@@ -313,55 +313,55 @@
long HDormID = list[0].HDormID;
string HArchivesNo = list[0].HArchivesNo;
DateTime HStayCardEDate = list[0].HStayCardEDate;
- DateTime HCheckCardEDate = list[0].HCheckCardEDate;
- string HJobCardNo = list[0].HJobCardNo;
- DateTime HJobCardEDate = list[0].HJobCardEDate;
+ DateTime HCheckCardEDate = Convert.ToDateTime("1900/1/1");
+ string HJobCardNo = list[0].HJobCardNo ?? "";
+ DateTime HJobCardEDate = Convert.ToDateTime("1900/1/1");
string HWorkType = list[0].HWorkType;
long HContractYear = list[0].HContractYear;
DateTime HContractBDate = list[0].HContractBDate;
DateTime HContractEDate = list[0].HContractEDate;
string HInsuranceNo = list[0].HInsuranceNo;
DateTime HInsuranceDate = list[0].HInsuranceDate;
- string HInsuranceStatus = list[0].HInsuranceStatus;
+ bool HInsuranceStatus = list[0].HInsuranceStatus;
DateTime HSignDate = list[0].HSignDate;
bool HSignStatus = list[0].HSignStatus;
- string HOldCompany = list[0].HOldCompany;
- string HMarr = list[0].HMarr;
- string HHomeAdd = list[0].HHomeAdd;
- string HNowAdd = list[0].HNowAdd;
- string HSpec = list[0].HSpec;
- string HCompLev = list[0].HCompLev;
- string HEngLev = list[0].HEngLev;
+ string HOldCompany = list[0].HOldCompany ?? "";
+ string HMarr = list[0].HMarr ?? "";
+ string HHomeAdd = list[0].HHomeAdd ?? "";
+ string HNowAdd = list[0].HNowAdd ?? "";
+ string HSpec = list[0].HSpec ?? "";
+ string HCompLev = list[0].HCompLev ?? "";
+ string HEngLev = list[0].HEngLev ?? "";
DateTime HGradDate = list[0].HGradDate;
- string HGradSchool = list[0].HGradSchool;
- string HSalaryLev = list[0].HSalaryLev;
+ string HGradSchool = list[0].HGradSchool ?? "";
+ string HSalaryLev = list[0].HSalaryLev ?? "";
long HDutyID = list[0].HDutyID;
- string HProTitleID = list[0].HProTitleID;
- string HKnowLev = list[0].HKnowLev;
- string HAvoird = list[0].HAvoird;
- string HStature = list[0].HStature;
- string HBloodType = list[0].HBloodType;
- string HBlightyType = list[0].HBlightyType;
- string HGovStatus = list[0].HGovStatus;
- string HNation = list[0].HNation;
- string HBlighty = list[0].HBlighty;
+ string HProTitleID = list[0].HProTitleID ?? "";
+ string HKnowLev = list[0].HKnowLev ?? "";
+ string HAvoird = list[0].HAvoird ?? "";
+ string HStature = list[0].HStature ?? "";
+ string HBloodType = list[0].HBloodType ?? "";
+ string HBlightyType = list[0].HBlightyType ?? "";
+ string HGovStatus = list[0].HGovStatus ?? "";
+ string HNation = list[0].HNation ?? "";
+ string HBlighty = list[0].HBlighty ?? "";
long HAge = list[0].HAge;
- string HExamLevPostMoney = list[0].HExamLevPostMoney;
- string HBSTDeptID = list[0].HBSTDeptID;
- string HRelDate = list[0].HRelDate;
- string HHighestPay = list[0].HHighestPay;
- string HOverPayRate = list[0].HOverPayRate;
- string HLeftMoneyRate = list[0].HLeftMoneyRate;
- string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
- string HPayType = list[0].HPayType;
- string HStdDayTimes = list[0].HStdDayTimes;
- string HStdDayPay = list[0].HStdDayPay;
- string HMinDayPay = list[0].HMinDayPay;
- string HMinMonthPay = list[0].HMinMonthPay;
+ string HExamLevPostMoney = list[0].HExamLevPostMoney ?? "";
+ string HBSTDeptID = list[0].HBSTDeptID ?? "";
+ string HRelDate = list[0].HRelDate ?? "";
+ string HHighestPay = list[0].HHighestPay ?? "";
+ string HOverPayRate = list[0].HOverPayRate ?? "";
+ string HLeftMoneyRate = list[0].HLeftMoneyRate ?? "";
+ string HInsuranceSubsidy = list[0].HInsuranceSubsidy ?? "";
+ string HPayType = list[0].HPayType ?? "";
+ string HStdDayTimes = list[0].HStdDayTimes ?? "";
+ string HStdDayPay = list[0].HStdDayPay ?? "";
+ string HMinDayPay = list[0].HMinDayPay ?? "";
+ string HMinMonthPay = list[0].HMinMonthPay ?? "";
DateTime HMadeDate = list[0].HMadeDate;
- string HEmpRate = list[0].HEmpRate;
- string HExamRate = list[0].HExamRate;
- DateTime HHealthCardEDate = list[0].HHealthCardEDate;
+ string HEmpRate = list[0].HEmpRate ?? "";
+ string HExamRate = list[0].HExamRate ?? "";
+ DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");
////鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, true, msg4))
@@ -419,7 +419,7 @@
"," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
- "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
+ "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + Convert.ToString(HInsuranceStatus ? 1 : 0) + "," + Convert.ToString(HSignStatus ? 1 : 0) +
",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
@@ -440,24 +440,90 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
oCN.RunProc("Update Gy_Employee set " +
- "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
- ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
- ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
- ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
- ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
- ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
- ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
- ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
- ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
- ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
- ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
- ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
- ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
- ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
- ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
- ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HLevel=" + HLevel +
+ ",HEmpRate=" + HEmpRate +
+ ",HExamRate=" + HExamRate +
+ ",HBasePay=" + HBasePay +
+ ",HParentID=" + HParentID +
+ ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString( HStopflag ? 1 : 0) +
+ ",HNoBrushFlag=" + Convert.ToString( HNoBrushFlag ? 1 : 0) +
+ ",HOverType=" + Convert.ToString( HOverType ? 1 : 0) +
+ ",HShiftFlag=" + Convert.ToString( HShiftFlag ? 1 : 0) +
+ ",HStopwagesFlag=" + Convert.ToString( HStopwagesFlag ? 1 : 0) +
+ ",HRemark='" + HRemark.ToString() + "'" +
+ ",HEmpType='" + HEmpType.ToString() + "'" +
+ ",HPayType='" + HPayType.ToString() + "'" +
+ ",HHelpCode='" + HHelpCode.ToString() + "'" +
+ ",HAge=" + HAge.ToString() +
+ ",HSalaryLev='" + HSalaryLev.ToString() + "'" +
+ ",HContractYear=" + HContractYear.ToString() +
+ ",HInsuranceStatus=" + Convert.ToString(HInsuranceStatus ? 1 : 0) +
+ ",HBirthday='" + HBirthDay.ToString() + "'" +
+ ",HGradDate='" + HGradDate.ToString() + "'" +
+ ",HInsuranceDate='" + HInsuranceDate + "'" +
+ ",HContractBDate='" + HContractBDate + "'" +
+ ",HContractEDate='" + HContractEDate + "'" +
+ ",HJobCardEDate='" + HJobCardEDate + "'" +
+ ",HCheckCardEDate='" + HCheckCardEDate + "'" +
+ ",HStayCardEDate='" + HStayCardEDate + "'" +
+ ",HHealthCardEDate='" + HHealthCardEDate + "'" +
+ ",HSex='" + HSex + "'" +
+ ",HMarr='" + HMarr + "'" +
+ ",HBlighty='" + HBlighty + "'" +
+ ",HNation='" + HNation + "'" +
+ ",HBlightyType='" + HBlightyType.ToString() + "'" +
+ ",HGovStatus='" + HGovStatus.ToString() + "'" +
+ ",HBloodType='" + HBloodType.ToString() + "'" +
+ ",HStature='" + HStature.ToString() + "'" +
+ ",HAvoird='" + HAvoird.ToString() + "'" +
+ ",HKnowLev='" + HKnowLev.ToString() + "'" +
+ ",HProTitleID='" + HProTitleID.ToString() + "'" +
+ ",HGradSchool='" + HGradSchool.ToString() + "'" +
+ ",HEngLev='" + HEngLev.ToString() + "'" +
+ ",HCompLev='" + HCompLev.ToString() + "'" +
+ ",HSpec='" + HSpec.ToString() + "'" +
+ ",HEmail='" + HEmail.ToString() + "'" +
+ ",HNowAdd='" + HNowAdd.ToString() + "'" +
+ ",HHomeAdd='" + HHomeAdd.ToString() + "'" +
+ ",HIDCard='" + HIDCard.ToString() + "'" +
+ ",HPostalCode='" + HPostalCode.ToString() + "'" +
+ ",HLinkPhone='" + HLinkPhone.ToString() + "'" +
+ ",HMobilePhone='" + HMobilePhone.ToString() + "'" +
+ ",HFax='" + HFax.ToString() + "'" +
+ ",HOldCompany='" + HOldCompany.ToString() + "'" +
+ ",HInsuranceNo='" + HInsuranceNo.ToString() + "'" +
+ ",HJobCardNo='" + HJobCardNo.ToString() + "'" +
+ ",HArchivesNo='" + HArchivesNo.ToString() + "'" +
+ ",HDimissionReason='" + HDimissionReason.ToString() + "'" +
+ ",HDimissionDate='" + HDimissionDate.ToString() + "'" +
+ ",HRelDate='" + HRelDate.ToString() + "'" +
+ ",HInComDate='" + HInComDate.ToString() + "'" +
+ ",HPostID =" + HPostID.ToString() +
+ ",HDutyID =" + HDutyID.ToString() +
+ ",HDormID =" + HDormID.ToString() +
+ ",HBank='" + HBank.ToString() + "'" +
+ ",HBankAccount='" + HBankAccount.ToString() + "'" +
+ ",HGroupID='" + HGroupID.ToString() + "'" +
+ ",HInsurance=" + HInsurance.ToString() + "" +
+ ",HInsuranceSubsidy=" + HInsuranceSubsidy.ToString() + "" +
+ ",HOtherDeduct3=" + HOtherDeduct3.ToString() + "" +
+ ",HMedicare=" + HMedicare.ToString() + "" +
+ ",HDrydock=" + HDrydock.ToString() + "" +
+ ",HWorkType='" + HWorkType.ToString() + "'" +
+ ",HWorkTypeID='" + HWorkTypeID.ToString() + "'" +
+ ",HHighestPay=" + HHighestPay.ToString() + "" +
+ ",HOverPayRate=" + HOverPayRate.ToString() + "" +
+ ",HLeftMoneyRate=" + HLeftMoneyRate.ToString() + "" +
+ ",HCTPrjID='" + HCTPrjID.ToString() + "'" +
+ ",HExamLevPostMoney=" + HExamLevPostMoney.ToString() +
+ ",HBSTDeptID='" + HBSTDeptID.ToString() + "'" +
+
+ ",HAddress='" + HAddress.ToString() + "'" +
+ ",HDeptID= '" + HDeptID + "' Where HItemID=" + HItemID);
oCN.Commit();
}
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index c648fca..fc04bad 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -165,6 +165,94 @@
}
}
+
+
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃缂栬緫鎸夐挳 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("ProdIn/ProdInDetaiNew")]
+ [HttpGet]
+ public object ProdInDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ /// <summary>
+ /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [Route("ProductIn/DisPlayBarCodeList_Json")]
+ [HttpGet]
+ public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[3].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[3];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
[Route("ProductIn/DisBillEntryList_Mate_Webs_Json")]
[HttpGet]
public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
@@ -210,6 +298,7 @@
[HttpGet]
public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
{
+ string aa = "";
try
{
// DataSet ds = new DataSet();
@@ -217,6 +306,7 @@
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
if (HSourceBillType == "3710")
{
+ aa = "鎵ц浜�";
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
if (HSourceBillType == "3711")
@@ -227,7 +317,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒";
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒"+aa;
objJsonResult.data = null;
return objJsonResult; ;
}
@@ -469,6 +559,7 @@
//string sSourceBillType = lsmain[0].HBillType;
//BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
//return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
try
{
List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -485,6 +576,7 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID= lsmain[0].HKeeperID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HWHID = lsmain[0].HWHID;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
similarity index 100%
rename from WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
rename to WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 24831dd..8a045aa 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -722,7 +722,7 @@
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
ls = oListModels.getObjectByJson_Report(msg1);
int i = 0;
@@ -924,7 +924,7 @@
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
List<Model.ClsSc_ProcessReportMain> lsmain = new List<Model.ClsSc_ProcessReportMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index b4a122e..3e0e9a6 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -64,6 +64,91 @@
}
+ /// <summary>
+ /// 閿�鍞嚭搴撶紦瀛樺垪琛ㄧ紪杈戞寜閽� 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("SellOut/SellOutDetaiNew")]
+ [HttpGet]
+ public object SellOutDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ //宸蹭笂浼犲垪琛ㄥ埛鏂�
+ [Route("Web/DisBillUpdateLoad_Json")]
+ [HttpGet]
+ public object DisBillUpdateLoad_Json(string HBillType, string HMaker, Int64 HOrgID)
+ {
+ try
+ {
+ ds = webserver.GetDisBillUpdateLoad_Json(HBillType, HMaker, HOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ 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;
+ }
+ }
+
+
+
[Route("SellOut/GetMAXNum")]
[HttpGet]
public object GetMAXNum()
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 8efa4cc..c4dec73 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -187,6 +187,45 @@
}
+
+ //鎾ら攢缂撳瓨鍒楄〃璁板綍
+ [Route("Web/Rescind_Json")]
+ [HttpGet]
+ public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
//鍒犻櫎缂撳瓨鍒楄〃璁板綍
[Route("Web/Delete_Json")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
new file mode 100644
index 0000000..ac1f82d
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjBillController.cs"
@@ -0,0 +1,349 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+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.BaseSet
+{
+ public class Gy_ClassTimePrjBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鏍哥畻鏂瑰紡鍒楄〃鏁版嵁
+ /// <summary>
+ /// 杩斿洖鏍哥畻鏂瑰紡鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList " + sWhere, "h_v_Gy_ClassTimePrjList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎鏍哥畻鏂瑰紡
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
+ DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
+ try
+ {
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡鏂板淇濆瓨
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ List<ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ClassTimePrj_Model>>(msg1);
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ long HParentID = list[0].HParentID;
+ long HLevel= list[0].HLevel;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ long HDeptID = list[0].HDeptID;
+ long HGroupID = list[0].HGroupID;
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_ClassTimePrj " +
+ "(HNumber,HName,HParentID,HDeptID,HGroupID" +
+ ",HStopflag,HRemark,HUseFlag) " +
+ " values('" + HNumber + "','" + HName + "','" + HParentID + "','" + HDeptID + "','" + HGroupID + "'" +
+ ",'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�')");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡淇敼淇濆瓨
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
+ DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsGy_ClassTimePrj_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ClassTimePrj_Model>>(msg2);
+
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ long HDeptID = list[0].HDeptID;
+ long HGroupID = list[0].HGroupID;
+
+ //鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oDept.HavSameNumber(HItemID, HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_ClassTimePrj set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HParentID=" + HParentID +
+ ",HDeptID=" + HDeptID +
+ ",HGroupID=" + HGroupID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡淇敼鑾峰彇缁戝畾鏁版嵁
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where HItemID=" + HInterID, "h_v_Gy_ClassTimePrjList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
similarity index 97%
rename from WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
rename to "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
index 3e0aa8b..428bbbb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
@@ -139,7 +139,7 @@
string HSumWorkTimes = list[0].HSumWorkTimes;
string HRate = list[0].HRate;
decimal HSumMoney = list[0].HSumMoney;
- DateTime HYear = list[0].HYear;
+ string HYear = list[0].HYear;
decimal HPeriod = list[0].HSumMoney;
decimal HOldRate = list[0].HOldRate;
//淇濆瓨
@@ -155,7 +155,7 @@
"," + HRate + "," + HSumMoney.ToString() + "," + HYear.ToString() + "," + HPeriod.ToString() +
"," + HOldRate.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else {
@@ -176,7 +176,7 @@
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
}
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
new file mode 100644
index 0000000..fc43e58
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
@@ -0,0 +1,263 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+
+ public class Gy_GroupEmpBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+
+ /// <summary>
+ /// 杩斿洖 鐝粍鑱屽憳娓呭崟 鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_GroupEmpBill/GetGroupEmpBill")]
+ [HttpGet]
+ public object GetGroupEmpBill(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetGroupEmpBill(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetGroupEmpBill(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by 鏃ユ湡 desc", "h_v_Gy_GroupEmpBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_GroupEmpBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
+ }
+
+ }
+
+ #region[鐝粍鑱屽憳娓呭崟鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Gy_GroupEmpBillListCheckDetail(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 top 1 * from h_v_Gy_GroupEmpBillList where hmainid= " + HID + " ", "h_v_Gy_GroupEmpBillList");
+ 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[鐝粍鑱屽憳娓呭崟鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
+ [Route("Gy_GroupEmpBill/Gy_GroupEmpBillListProjectDetai")]
+ [HttpGet]
+ public object Gy_GroupEmpBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT " +
+ "HGroupID,鐝粍浠ｇ爜,鐝粍,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
+ ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡" +
+ ",HEmpID,HEmpNumber,HEmpName ,琛ㄤ綋澶囨敞 as HRemark FROM h_v_Gy_GroupEmpBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ [Route("Gy_GroupEmpBill/SaveGetGroupEmpBillList")]
+ [HttpPost]
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ public object SaveGetGroupEmpBillList([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 refSav = sArray[2].ToString();
+ //string msg4 = sArray[3].ToString();
+
+ string UserName = "";
+ string s = "";
+ long mouldid;
+ ListModels oListModels = new ListModels();
+ try
+ {
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DLL.ClsGy_GroupEmpBill oBill = new DLL.ClsGy_GroupEmpBill();
+ List<Models.ClsGy_GroupEmpListMain> lsmain = new List<Models.ClsGy_GroupEmpListMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_GroupEmpListMain(msg2);
+ foreach (Models.ClsGy_GroupEmpListMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "9876";
+ oItem.HBillSubType = "9876";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ 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<Models.ClsGy_GroupEmpListSub> ls = new List<Models.ClsGy_GroupEmpListSub>();
+ ls = oListModels.getObjectByJson_Gy_GroupEmpListSub(msg3);
+ int i = 0;
+ foreach (Models.ClsGy_GroupEmpListSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ 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 = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ 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;
+ }
+ }
+
+ /// <summary>
+ ///鐝粍鑱屽憳娓呭崟鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_GroupEmpBill/DeltetGroupEmpBill")]
+ [HttpGet]
+ public object DeltetGroupEmpBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Gy_GroupEmpListMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Gy_GroupEmpListSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 56123ae..3554f14 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -597,15 +597,20 @@
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
{
string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
- ,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
- ,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
- ,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
- ,a.HSourceInterID,a.HSourceEntryID,a.HSourceBillNo, a.HSourceBillType
- from Sc_ICMOBillWorkQtyStatus_Tmp a
- left join Gy_Material m on a.HMaterID=m.hitemid
- left join Gy_Source s on a.HSourceID=s.HItemID
- left join Gy_Group g on a.HGroupID=g.HItemID
- left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
+ ,b.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
+ ,b.HEmpID,b.HEmpNumber,e.HName HEmpName,a.HMaker,a.HMakeDate, '宸ュ簭姹囨姤' HReportType
+ ,b.HQty,a.HICMOBillNo,a.HICMOInterID,pr.HProcNo,b.HProcID,p.HNumber HProcNumber,p.HName HProcName
+ ,b.HSourceInterID,b.HSourceEntryID,b.HSourceBillNo,b.HSourceBillType
+ from Sc_ProcessReportMain a
+ inner join Sc_ProcessReportSub b on a.HInterID=B.HInterID
+ inner join (select max(HProcNo) HProcNo,HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ from Sc_ProcessPlanSub group by HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo)
+ pr on b.HSourceBillNo=pr.HSourceBillNo and b.HSourceInterID=pr.HSourceInterID and b.HSourceEntryID=pr.HSourceEntryID
+ left join Gy_Process p on b.HProcID=p.HItemID
+ left join Gy_Material m on a.HMaterID=m.hitemid
+ left join Gy_Source s on b.HSourceID=s.HItemID
+ left join Gy_Group g on a.HGroupID=g.HItemID
+ left join Gy_Employee e on b.HEmpID=e.HItemID "+sWhere+" and HRelationInterID='0'");
return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
}
#endregion
@@ -622,7 +627,7 @@
{
try
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ProcessReportSub with (nolock)" + sWhere, "Sc_ProcessReportSub");
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
@@ -650,9 +655,9 @@
}
#endregion
- #region 鎶ュ伐骞冲彴浜ч噺姹囨姤淇濆瓨/缂栬緫
+ #region 鎶ュ伐骞冲彴宸ュ簭姹囨姤淇濆瓨/缂栬緫
/// <summary>
- /// 寮�宸ュ崟
+ /// 宸ュ簭姹囨姤鎻愪氦
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -669,12 +674,12 @@
ListModels oListModels = new ListModels();
try
{
- DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp();
- List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> lsmain = new List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp>();
+ DLL.ClsSc_ProcessReport oBill = new DLL.ClsSc_ProcessReport();
+ List<Models.ClsSc_ProcessReportMain> lsmain = new List<Models.ClsSc_ProcessReportMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_MESProductReportFrom(msg2);
- foreach (Models.ClsSc_ICMOBillWorkQtyStatus_Tmp oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_ProcessReportMain(msg2);
+ foreach (Models.ClsSc_ProcessReportMain oItem in lsmain)
{
if (refSav == "Add")
{
@@ -725,10 +730,11 @@
}
}
- oItem.HBillType = "3724";
- oItem.HBillSubType = "3724";
- oItem.HReportType = 3;//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
+ oItem.HBillType = "3714";
+ oItem.HBillSubType = "3714";
oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -738,6 +744,30 @@
return objJsonResult;
}
oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<Models.ClsSc_ProcessReportSub> ls = new List<Models.ClsSc_ProcessReportSub>();
+ ls = oListModels.getObjectByJson_ProcessReportSub(msg2);
+ int i = 0;
+ foreach (Models.ClsSc_ProcessReportSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
}
//淇濆瓨
@@ -753,7 +783,7 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameter.omodel.Sc_MESProceReportWorkBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
objJsonResult.Verify = "Y";
}
@@ -797,7 +827,7 @@
}
#endregion
- #region 鎶ュ伐骞冲彴浜ч噺姹囨姤瀹℃牳銆佸弽瀹℃牳
+ #region 鎶ュ伐骞冲彴宸ュ簭姹囨姤瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
/// </summary>
@@ -809,7 +839,7 @@
[HttpGet]
public object MESProductAuditProcessReportList(int HSourceID, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, int HICMOInterID, int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "MES_ProcExchReport_Check";
+ string ModRightNameCheck = "MES_ProductReport_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -833,7 +863,7 @@
}
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp();
+ DLL.ClsSc_ProcessReport oBill = new DLL.ClsSc_ProcessReport();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -887,7 +917,7 @@
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
//瀹℃牳鎻愪氦
- if (oBill.CheckBill(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -907,7 +937,7 @@
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
//鍙嶅鏍告彁浜bandonCheck
- if (oBill.AbandonCheck(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -945,17 +975,11 @@
try
{
oCN.BeginTran();
- //鏌ヨ浜ч噺姹囨姤涓存椂琛ㄦ暟閲�
- ds = oCN.RunProcReturn("select isnull(HQty,0) HQty,isnull(HWasterQty,0) HWasterQty,isnull(HBadQty,0) HBadQty from Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
- double HQty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
- double HWasterQty = double.Parse(ds.Tables[0].Rows[0]["HWasterQty"].ToString());
- double HBadQty = double.Parse(ds.Tables[0].Rows[0]["HBadQty"].ToString());
- double sumqty = HQty + HBadQty + HWasterQty; //姹囨姤鏁伴噺+涓嶈壇+鎶ュ簾
- //鏇存柊浜ч噺瑁呴噺涓存椂琛ㄥ凡姹囨姤鏁伴噺
- string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp set HICMOStatus='1',HFinishFlag='0', HRelationInterID=0,HSplitRelationQty=HSplitRelationQty-" + sumqty + ",HDateFinishQty=HDateFinishQty-" + sumqty + " where HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
+ //鍒犻櫎宸ュ簭姹囨姤瀛愯〃
+ string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='"+HInterID+"' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
oCN.RunProc(sql1);
- //鏇存柊鍒囨崲鐘舵�佸��
- string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
+ //鍒犻櫎宸ュ簭姹囨姤涓昏〃
+ string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");
oCN.RunProc(sql);
oCN.Commit();
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
index 0338614..77bd95d 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
@@ -26,13 +26,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
else
{
- string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
+ string sql1 = "select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where 1 = 1 ";
string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -59,7 +59,7 @@
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
if (ds.Tables[0].Rows.Count > 0)
{
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index b27244c..f70be5b 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -7,8 +7,8 @@
{
public class ClsSc_ProcessReport:DBUtility.ClsXt_BaseBill
{
- public Model.ClsSc_ProcessReportMain omodel = new Model.ClsSc_ProcessReportMain();
- public List<Model.ClsSc_ProcessReportSub> DetailColl = new List<Model.ClsSc_ProcessReportSub>();
+ public Models.ClsSc_ProcessReportMain omodel = new Models.ClsSc_ProcessReportMain();
+ public List<Models.ClsSc_ProcessReportSub> DetailColl = new List<Models.ClsSc_ProcessReportSub>();
public ClsSc_ProcessReport()
{
@@ -71,7 +71,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
+ foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_ProcessReportSub " +
" (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
@@ -143,7 +143,7 @@
",'" + omodel.HInnerBillNo + "','" + omodel.HMaker.ToString() + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
+ foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_ProcessReportSub " +
" (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
@@ -257,7 +257,7 @@
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsSc_ProcessReportSub oSub = new Model.ClsSc_ProcessReportSub();
+ Models.ClsSc_ProcessReportSub oSub = new Models.ClsSc_ProcessReportSub();
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
//
@@ -374,6 +374,41 @@
}
}
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ DataSet oDs = new DataSet();
+ string sBillName = "";
+ sReturn = "";
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ //
+ oDs = oCn.RunProcReturn("select * from Sc_ProcessReportSub where HInterID=" + lngBillKey.ToString(), "Sc_ProcessReportSub");
+ if (oDs == null || oDs.Tables[0].Rows.Count == 0)
+ {
+ return false;
+ }
+ for (int i = 0; i <= oDs.Tables[0].Rows.Count - 1; i++)
+ {
+ long ProdMoveInterID = DBUtility.ClsPub.CreateBillID("3771", ref DBUtility.ClsPub.sExeReturnInfo);
+ string ProdMoveBillNo = DBUtility.ClsPub.CreateBillCode("3771", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //oCn.RunProc("exec h_p_Sc_ProcProdMoveBill_Add " + lngBillKey.ToString() + "," + DBUtility.ClsPub.isLong(oDs.Tables[0].Rows[i]["HEntryID"]).ToString() + "," + ProdMoveInterID.ToString() + ",'" + ProdMoveBillNo + "','" + HChecker + "'");
+ sBillName = sBillName + ProdMoveBillNo + ",";
+ }
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
+
+ sReturn = sBillName;
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//鍒犻櫎鍏宠仈
public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
diff --git "a/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs" "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
new file mode 100644
index 0000000..dddb1cf
--- /dev/null
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
@@ -0,0 +1,106 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_GroupEmpBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsGy_GroupEmpListMain omodel = new Models.ClsGy_GroupEmpListMain();
+ public List<Models.ClsGy_GroupEmpListSub> DetailColl = new List<Models.ClsGy_GroupEmpListSub>();
+
+ public ClsGy_GroupEmpBill()
+ {
+ base.MvarItemKeySub = "Gy_GroupEmpListSub";
+ base.MvarItemKeySub2 = " ";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_GroupEmpListMain";
+ base.MvarReportTitle = "鐝粍鑱屽憳娓呭崟";
+ base.BillType = "9876";
+ base.HBillSubType = "9876";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsGy_GroupEmpBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_GroupEmpListMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HGroupID=" + omodel.HGroupID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
+ }
+ 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);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ string sql = string.Format(@"Insert Into Gy_GroupEmpListMain(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HGroupID,HMaker,HMakeDate) values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupID.ToString() + "','" + DBUtility.ClsPub.CurUserName + "',getdate())");
+ oCn.RunProc(sql);
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_GroupEmpListSub (HInterID,HEntryID,HEmpID,HRemark ) values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HEmpID.ToString() + ",'" + oSub.HRemark.ToString() + "')");
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ }
+
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 7de695b..fadab98 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1903,5 +1903,45 @@
return list;
}
#endregion
+ #region 鐝粍鑱屽憳娓呭崟
+ public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsGy_GroupEmpListSub> getObjectByJson_Gy_GroupEmpListSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsGy_GroupEmpListSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_GroupEmpListSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportMain> getObjectByJson_ProcessReportMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportSub> getObjectByJson_ProcessReportSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_ProcessReportMain.cs b/WebAPI/Models/ClsSc_ProcessReportMain.cs
new file mode 100644
index 0000000..79a11a2
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessReportMain.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessReportMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public string HBillSubType;// varchar(50) -- 子类型
+ public Int64 HCheckItemNowID;// int --当前审核项目（默认值 0） （界面不显示）
+ public Int64 HCheckItemNextID;// int --待审核项目（默认值 0）
+ public Int64 HICMOInterID;// int --任务单ID （界面不显示）
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HDeptID;// int --部门ID
+ public string HDeptNumber;// varchar(50) --部门代码
+ public Int64 HGroupID;// int --班组ID
+ public string HGroupNumber;// varchar(50) --班组代码
+ public Int64 HMaterID;// int --产品ID
+ public string HMaterNumber;// varchar(100) --产品代码
+ public Int64 HUnitID;// int --单位ID
+ public string HUnitNumber;// varchar(100) --单位代码
+ public double HPlanQty;// dec(18,8) --计划数量
+ public double HInStockQty;// dec(18,8) --入库数量
+ public Single HSumTimes;// money --总工作时间
+ public string HExplanation;// varchar(500) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public bool HCloseType;// bit --关闭类型
+ public Int64 HSupID; //供应商
+ public string HMarker; //检验人
+
+ public Int64 HICMOStatusInterID;//生产状态表内码
+ }
+}
diff --git a/WebAPI/Models/ClsSc_ProcessReportSub.cs b/WebAPI/Models/ClsSc_ProcessReportSub.cs
new file mode 100644
index 0000000..c53593c
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessReportSub.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessReportSub:DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID;// int --物料
+ public string HMaterNumber;// varchar(50) --物料代码
+ public Int64 HProcID;// int --工序
+ public string HProcNumber;// varchar(50) --工序代码
+ public Int64 HEmpID;// int --操作工
+ public string HEmpNumber;// varchar(50) --操作工代码
+ public Int64 HSourceID;// int --生产资源ID
+ public DateTime HRelBeginDate;// datetime --实际开工日期
+ public DateTime HRelEndDate;// datetime --实际完工日期
+ public Single HTimes;// money --实作时间
+ public double HQty;// dec(18,8) --实作数量
+ public double HCheckQty;// dec(18,8) --合格数量
+ public Single HBadCount;// money --不良品数
+ public Single HWasterQty;// money --因工报废数量
+ public Single HWasterQty2;// money --因料报废数量
+ public double HPrice;// dec(18,8) --工序工价
+ public Single HMoney;// money -- 计件金额
+
+ public Single HBadPrirce;// money -- 不良单价
+ public Single HBadMoney;// money -- 不良金额
+ public Single HWasterPrice;// money -- 报废单价
+ public Single HWasterMoney;// money -- 报废金额
+ public Single HQualityRate;// money -- 质量系数
+ public Single HOutPrice; //加工单价
+ public Single HOutMoney; //加工费金额
+ public Single HWeight; //加工重量
+
+ public double HSecUnitQty1;// dec(18,8) -- 辅助单位数量1
+ public Single HSecUnitRate1;// money -- 换算率1
+ public double HSecUnitQty2;// dec(18,8) -- 辅助单位数量2
+ public Single HSecUnitRate2;// money -- 换算率2
+ public Single HUsingQty;// money -- 让步数量
+ public Single HSelfBadCount;// money -- 本道返工
+ public Single HPreBadCount;// money -- 前道不良数
+
+ public Single HPayMentQty;// money -- 结算数量
+ public Single HOtherDeduct;// money -- 其他扣款（油石费
+ public Single HRelPay;// money -- 实得工资
+
+ public string HOtherItem1;// varchar(50) --其他属性1（游隙）
+ public string HOtherItem2;// varchar(50) --其他属性2（盖子）
+ public string HOtherItem3;// varchar(50) --其他属性3（油脂）
+ public string HOtherItem4;// varchar(50) --其他属性4（级别）
+ public string HOtherItem5;// varchar(50) --其他属性5
+ public string HPackType;// varchar(50) --包装类型
+
+ public Int64 HCheckEmpID;// int --检验员
+ public string HCheckEmpNumber;// varchar(50) --检验员代码
+
+ public Int64 HProcPlanInterID;// int --工序计划单ID
+ public Int64 HProcPlanEntryID;// int --工序计划单子ID
+ public string HProcPlanBillNo;// varchar(50) --工序计划单号
+ public Int64 HICMOInterID;// int --任务单ID
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HSeOrderInterID;// int --销售订单主ID
+ public Int64 HSeOrderEntryID;// int --销售子ID
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HRemark;// --备注
+ public string HBatchNo;
+ }
+}
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
index d49c5dd..3aef35c 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
@@ -13,7 +13,7 @@
public string HName { get; set; }
public string HNumber { get; set; }
public long hparentid { get; set; }
- public DateTime HYear { get; set; }
+ public string HYear { get; set; }
public decimal HPeriod { get; set; }
public decimal HSumMoney { get; set; }
public string HSumWorkTimes { get; set; }
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
index ffa45fb..846728b 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
@@ -64,7 +64,7 @@
public DateTime HContractEDate { get; set; }
public string HInsuranceNo { get; set; }
public DateTime HInsuranceDate { get; set; }
- public string HInsuranceStatus { get; set; }
+ public bool HInsuranceStatus { get; set; }
public DateTime HSignDate { get; set; }
public bool HSignStatus { get; set; }
public string HOldCompany { get; set; }
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_ClassTimePrj_Model.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_ClassTimePrj_Model.cs"
new file mode 100644
index 0000000..9bdbdc6
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_ClassTimePrj_Model.cs"
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_ClassTimePrj_Model : DBUtility.ClsGy_Base_Model
+ {
+ //
+ public Int64 HDeptID;
+ public Int64 HGroupID;
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs"
new file mode 100644
index 0000000..6b5d835
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListMain.cs"
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_GroupEmpListMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HGroupID;// int //班组ID
+
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs"
new file mode 100644
index 0000000..6a72282
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpListSub.cs"
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_GroupEmpListSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HEmpID;
+
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 09cdf98..fdef600 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.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|2021-12-10T06:12:36.4065298Z;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2021-12-22T05:51:37.1082523Z;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/21/2021 13:55:27</publishTime>
+ <publishTime>12/22/2021 22:01:30</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/21/2021 13:55:27</publishTime>
+ <publishTime>12/22/2021 22:01:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/21/2021 13:55:25</publishTime>
+ <publishTime>12/22/2021 22:01:29</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/21/2021 13:55:25</publishTime>
+ <publishTime>12/22/2021 22:01:29</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/21/2021 13:55:21</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/21/2021 13:55:21</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:13</publishTime>
+ <publishTime>12/22/2021 19:58:31</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/21/2021 13:55:22</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/21/2021 13:55:22</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:25</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:25</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/21/2021 13:55:20</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/21/2021 13:55:30</publishTime>
+ <publishTime>12/22/2021 20:38:25</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll.config">
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/21/2021 13:55:30</publishTime>
+ <publishTime>12/22/2021 20:38:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +207,166 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 19:50:53</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/21/2021 13:55:41</publishTime>
+ <publishTime>12/22/2021 22:01:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 35cbee5..a3c8fd6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -173,6 +173,10 @@
<HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="WebAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\WebAPI.dll</HintPath>
+ </Reference>
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
<Private>True</Private>
@@ -279,8 +283,6 @@
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -348,12 +350,16 @@
<Compile Include="Controllers\MoveStockBillController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\ReportStepPlatFormController.cs" />
+ <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\PurchaseOrderController.cs" />
<Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_GroupEmpBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_WorkTimesBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
@@ -368,7 +374,7 @@
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESTransFerWorkBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
- <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
+ <Compile Include="Controllers\Sc_MouldRepairInBillListController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -385,7 +391,6 @@
<Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
- <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
@@ -452,15 +457,19 @@
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
<Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportSub.cs" />
<Compile Include="Models\GetWeekList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillSub.cs" />
@@ -504,7 +513,9 @@
<Compile Include="Models\ClsOA_InformBillSub.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListSub.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillSub.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 6509869..b44ef78 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -7832,5 +7832,40 @@
return ds;
}
#endregion
+
+ /// <summary>
+ /// 杩斿洖鎵爜鏄庣粏淇℃伅
+ /// </summary>
+ public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg);
+ //DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
+ }
+
+ //鎾ら攢缂撳瓨鍒楄〃閫変腑鏁版嵁
+ public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍒犻櫎澶辫触锛�";
+ return false;
+ }
+ }
+
+ //杩斿洖缂撳瓨鍒楄〃宸蹭笂浼犲垪琛ㄤ俊鎭�
+ public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1