From 2bc24245838af613a6101a1e835bedf29ad8b8cf Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 11 十一月 2021 19:07:12 +0800
Subject: [PATCH] 1、器具档案新增编辑页面增加货主类型、预警寿命 2、新增器具保养规程单
---
WebAPI/Models/QC_OutCompCheckBillSub.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 194 ++--
WorkM/流转卡管理/MES_StationEntrustInBill.cs | 14
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 80 -
WorkM/流转卡管理/MES_StationInBill.cs | 14
WebAPI/Models/Pay_PeriodInfoSet.cs | 26
WorkM/流转卡管理/MES_StationOutBill.cs | 16
WebAPI/Models/基础资料/Gy_ClassTimePrjSub.cs | 32
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 13
BLL/系统管理/会计期间/Xt_AccountPeriod.cs | 13
WebAPI/Models/ClsOA_InformBillMain.cs | 17
DAL/车间管理/ClsSc_StationOutBill.cs | 3
WorkM/流转卡管理/MES_StationEntrustOutBill.designer.cs | 130 ++
WebAPI/DLL/ClsOA_InformBill.cs | 229 +++++
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 12
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 10
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 227 +++++
WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs | 382 +++++++++
WebAPI/Controllers/BLL/Xt_UserController.cs | 2
DAL/车间管理/ClsSc_StationEntrustOutBill.cs | 1
WebAPI/Controllers/WebAPIController.cs | 4
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 30
WebAPI/Models/ClsOA_InformBillSub.cs | 13
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 21
WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs | 285 ++++++
WorkM/流转卡管理/MES_StationEntrustOutBill.cs | 82 +
WebAPI/Controllers/PublicPageMethodController.cs | 187 ++++
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 33
WebAPI/Models/UserPower.cs | 17
WebAPI/ListModels.cs | 23
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 23
WebAPI/WebAPI.csproj | 9
WebAPI/Controllers/GG_NoticeController.cs | 298 +++++++
33 files changed, 2,177 insertions(+), 265 deletions(-)
diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod.cs"
index e098933..18e82c6 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod.cs"
@@ -502,6 +502,19 @@
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet Ds;
+ //鑾峰彇褰撳墠浼氳鏈熼棿
+ Ds = oCn.RunProcReturn("select top 1 HYear,HPeriod from xt_AccountPeriod Where HEndFlag=0 order by HYear,HPeriod ", "Xt_AccountPeriod");
+ if(Ds==null)
+ {
+ MessageBox.Show("鑾峰彇褰撳墠浼氳鏈熼棿鍑洪敊锛�" + DBUtility.ClsPub.sErrInfo);
+ return;
+ }
+ else
+ {
+ ClsPub.CurYear = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HYear"]);
+ ClsPub.CurPeriod = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HPeriod"]);
+ }
+ //
if (MessageBox.Show("纭畾瑕佺粨璐�" + ClsPub.CurYear + "-" + ClsPub.CurPeriod + "鏈熼棿锛�", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
{
return;
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationEntrustOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationEntrustOutBill.cs"
index b1e58dc..37c8bf9 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationEntrustOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationEntrustOutBill.cs"
@@ -121,6 +121,7 @@
",HProcID=" + omodel.HProcID.ToString() +
",HBadPNL=" + omodel.HBadPNL.ToString() +
",HWasterQty=" + omodel.HWasterQty.ToString() +
+ ",HBadCount=" + omodel.HBadCount.ToString() +
//",HICMOQty=" + omodel.HICMOQty.ToString() +
//",HPlanQty=" + omodel.HPlanQty.ToString() +
//",HStationOutTime='" + omodel.HStationOutTime + "'" +
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index c38efe1..d4ef820 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -105,6 +105,7 @@
",HMouldNum='" + omodel.HMouldNum.ToString() + "'" +
",HSourceNameList='" + omodel.HSourceNameList.ToString() + "'" +
",HWasterQty=" + omodel.HWasterQty.ToString() +
+ ",HBadCount=" + omodel.HBadCount.ToString() +
",HLastSubProc=" + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -545,7 +546,7 @@
// " \"FEntity_Link_FSId\":" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOEntryID"]) + " " +
// " } ] } " +
// " ] }}";
- // //
+ // //6
// oWeb.WebService1 oweb = new DAL.oWeb.WebService1();
// //
// oweb.Url = Pub_Class.ClsPub.HWEBSUrl_CLD;
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 8699de8..1a8f780 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -127,6 +127,10 @@
{
omodel.Kf_POStockInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BarCodeMustSameSourceBill")
+ {
+ omodel.Kf_POStockInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//领料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
{
@@ -205,7 +209,11 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BillTypeOneScan")
{
omodel.Kf_ProductInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
- }
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BarCodeMustSameSourceBill")
+ {
+ omodel.Kf_ProductInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index def4b5d..d12b348 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -10,6 +10,7 @@
public string Kf_POStockInBill_AutoCheck;
public string Kf_POStockInBill_ERPMode;
public string Kf_POStockInBill_MustQtyCtl;
+ public string Kf_POStockInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致（唯一码时：条码档案的源单主内码和子内码 ，必须和扫码入库时的源单主内码子内码一致）
public string Kf_POStockInBill_MulSourceBill; //多源单模式
public string Kf_POStockInBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
//采购退料
@@ -39,7 +40,7 @@
public string Kf_ProductInBill_ERPMode;
public string Kf_ProductInBill_MustQtyCtl;
public string Kf_ProductInBill_MulSourceBill; //多源单模式
- public string Kf_ProductInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致（扫码生成的汇报为源单时，必须扫码汇报单上扫码过的条码，否则报错）
+ public string Kf_ProductInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致（唯一码时：条码档案的源单主内码和子内码 ，必须和扫码入库时的源单主内码子内码一致；扫码生成的汇报为源单时，必须扫码汇报单上扫码过的条码，否则报错）
public string Kf_ProductInBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
//产品退库
public string Kf_ProductInBackBill_AutoCheck;
@@ -213,13 +214,14 @@
//质量汇报单
public string Sc_ICMOBillQualityStatus_AutoCheck; //自动审核
//上料防错单
- public string Sc_MaterToSourceBill_AutoCheck; //自动审核
+ public string Sc_MaterToSourceBill_AutoCheck; //自动审核
+ public string Sc_MaterToSourceBill_MouldLifeCtrl; //保存时器具寿命控制 （Y 控制， N 不控制 当器具预计寿命或者当前寿命不足时，不允许上料）
+ public string Sc_MaterToSourceBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
//QMS
//首件检验单
- public string QC_FirstPieceCheckBill_AutoCheck; //自动审核
-
+ public string QC_FirstPieceCheckBill_AutoCheck; //自动审核
//工序进站接收单
public string MES_StationInBill_SaveAutoAddnew; //自动新增
//工序出站汇报单
@@ -229,6 +231,17 @@
//工序委外接收单
public string MES_StationEntrustOutBill_SaveAutoAddnew; //自动新增
+
+ //EAM
+
+ //器具领用出库单
+ public string Sc_MouldProdOutBill_AutoCheck; //自动审核
+ public string Sc_MouldProdOutBill_SaveAutoAddnew; //保存后自动新增
+ public string Sc_MouldProdOutBill_MouldLifeCtrl; //保存时器具寿命控制 （Y 控制， N 不控制 当器具预计寿命或者当前寿命不足时，不允许领用）
+ public string Sc_MouldProdOutBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
+
+
+
}
}
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index b316bd1..9cff91f 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -261,7 +261,7 @@
lsmain = oListModels.getObjectByJson_Gy_UserSupper(msg2);
oCN.BeginTran();
//鍒犻櫎宸茬粡鍏宠仈鐨勬暟鎹�
- oCN.RunProc("Delete From Gy_UserSupplierRelation where HUserID=" + msg3.ToString());
+ oCN.RunProc("Delete From Gy_UserSupplierRelation where HUserID='" + msg3.ToString() + "'");
foreach (Models.Gy_UserSupper oItem in lsmain)
{
//閲嶆柊鍐欏叆鍏宠仈鏁版嵁
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
new file mode 100644
index 0000000..0bfaf70
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
@@ -0,0 +1,285 @@
+锘縰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_ClassTimePrjSubController : 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_ClassTimePrjSub/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where 1=1 ", "h_v_Gy_ClassTimePrjSubList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_ClassTimePrjSubList where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjSubList");
+ }
+ 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_ClassTimePrjSub/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjSubList");
+ 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_ClassTimePrjSub/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_ClassTimePrjSub_Ctl oDept = new DAL.ClsGy_ClassTimePrjSub_Ctl();
+ DAL.ClsGy_ClassTimePrjSub_View oDeptHlp = new DAL.ClsGy_ClassTimePrjSub_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_ClassTimePrjSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrjSub>>(msg2);
+
+ long HInterID = list[0].HInterID;
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ long hparentid = list[0].hparentid; ;
+ string HMaker = list[0].HMaker; ;
+ string HSumWorkTimes = list[0].HSumWorkTimes;
+ string HRate = list[0].HRate;
+ decimal HSumMoney = list[0].HSumMoney;
+ DateTime HYear = list[0].HYear;
+ decimal HPeriod = list[0].HSumMoney;
+ decimal HOldRate = list[0].HOldRate;
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_ClassTimePrjSub" +
+ " (HInterID,HMaker,HMakeDate,HSumWorkTimes" +
+ ",HRate,HSumMoney,HYear,HPeriod" +
+ ",HOldRate) " +
+ " Values(" + HInterID + ",'" + HMaker + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'," + HSumWorkTimes.ToString() +
+ "," + 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.Commit();
+ }
+ else {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_ClassTimePrjSub set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HMaker='" + HMaker + "'" +
+ ",hparentid=" + hparentid.ToString() +
+ ",HSumWorkTimes=" + HSumWorkTimes.ToString() +
+ ",HSumMoney=" + HSumMoney.ToString() +
+ ",HYear=" + HYear.ToString() +
+ ",HPeriod=" + HPeriod.ToString() +
+ ",HOldRate=" + HOldRate.ToString() +
+ ",HRate= '" + HRate + "' 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_ClassTimePrjSub 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_ClassTimePrjSub")]
+ [HttpGet]
+ public object DeltetGy_ClassTimePrjSub(string HItemID)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+
+ 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_ClassTimePrjSub where HItemID=" + HItemID, "Gy_ClassTimePrjSub");
+ 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_ClassTimePrjSub Where HParentID='" + HItemID + "'", "Gy_ClassTimePrjSub");
+ 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_ClassTimePrjSub 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_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 9ec1e53..ee9a7f6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -25,7 +25,7 @@
/// </summary>
[Route("Gy_Customer/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere, string Organization)
{
try
{
@@ -39,22 +39,11 @@
string sql = sql1 + sWhere + " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
}
- 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;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 4189e68..e2877bc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -27,7 +27,7 @@
/// </summary>
[Route("Gy_Material/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere, string Organization)
{
try
{
@@ -41,22 +41,12 @@
string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
}
- 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;
- }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -231,7 +221,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HEndFlag = true;//鏈骇鏍囧織
oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
@@ -359,7 +349,7 @@
/// </summary>
[Route("Gy_Mould/list1")]
[HttpGet]
- public object list1(string sWhere,string ModRightNameSelect, string user)
+ public object list1(string sWhere, string ModRightNameSelect, string user)
{
try
{
@@ -373,7 +363,7 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
}
else
{
@@ -425,7 +415,7 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_CheckToolsFileMainList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_CheckToolsFileMainList");
}
else
{
@@ -473,7 +463,7 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList");
}
else
{
@@ -618,9 +608,9 @@
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
- "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
- "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER +"',"+ "','" + HSaveLife + "'," +
") ");
@@ -634,7 +624,7 @@
" values('" + HInterID + "',0,''" +
",0,0,'','',0,0 " +
") ");
-
+
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -693,7 +683,7 @@
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
-
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
@@ -783,7 +773,7 @@
",HMouldOWNER='"+ HMouldOWNER+"'"+
",HProdWeight=" + HProdWeight.ToString() +
" where HInterID=" + HInterID.ToString());
-
+
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
@@ -859,24 +849,24 @@
return objJsonResult;
}
if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- //鍐欏叆鏃ュ織
- ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.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;
- }
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.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");
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 58001c2..4e10ae8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -39,22 +39,13 @@
string sql = sql1 + sWhere + " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
}
- 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)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index ce6c01c..792754c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -41,22 +41,12 @@
string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
}
- 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)
{
diff --git a/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
new file mode 100644
index 0000000..d5cd288
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs
@@ -0,0 +1,382 @@
+锘縰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
+{
+ //鐝粍Controller
+ public class Pay_PeriodInfoSetController : 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("Pay_PeriodInfoSet/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Pay_PeriodInfoSetList " + sWhere, "h_v_Pay_PeriodInfoSetList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Pay_PeriodInfoSetList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Pay_PeriodInfoSetList");
+ }
+ 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("Pay_PeriodInfoSet/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Pay_PeriodInfoSetList where HitemID=" + HInterID, "h_v_Pay_PeriodInfoSetList");
+ 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("Pay_PeriodInfoSet/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsPay_PeriodInfoSet_Ctl oDept = new DAL.ClsPay_PeriodInfoSet_Ctl();
+ List<Pay_PeriodInfoSet> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_PeriodInfoSet>>(msg1);
+ long HItemID = list[0].HItemID;
+ long HYear = list[0].HYear;
+ long HPeriod = list[0].HPeriod;
+ decimal HWorkTimes = list[0].HWorkTimes;
+ decimal HOverWorkTimes = list[0].HOverWorkTimes;
+ decimal HBasePay = list[0].HBasePay;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ string sql = "Insert into Pay_PeriodInfoSet " +
+ " (HStopflag,HRemark " +
+ ",HYear,HPeriod,HWorkTimes,HOverWorkTimes,HBasePay)" +
+ " Values( " + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + "," + HWorkTimes.ToString() + "," + HOverWorkTimes.ToString() + "," + HBasePay.ToString() +
+ ")";
+ oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Pay_PeriodInfoSet set HStopflag=0 where HItemID=" + HItemID, 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("Pay_PeriodInfoSet/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsPay_PeriodInfoSet_Ctl oDept = new DAL.ClsPay_PeriodInfoSet_Ctl();
+ DAL.ClsPay_PeriodInfoSet_View oDeptHlp = new DAL.ClsPay_PeriodInfoSet_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<Pay_PeriodInfoSet> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_PeriodInfoSet>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ long HYear = list[0].HYear;
+ long HPeriod = list[0].HPeriod;
+ decimal HWorkTimes = list[0].HWorkTimes;
+ decimal HOverWorkTimes = list[0].HOverWorkTimes;
+ decimal HBasePay = list[0].HBasePay;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+
+ ////鍒ゆ柇鏉冮檺
+ //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 Pay_PeriodInfoSet " +
+ " (HStopflag,HRemark " +
+ ",HYear,HPeriod,HWorkTimes,HOverWorkTimes,HBasePay)" +
+ " Values( " + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + "," + HWorkTimes.ToString() + "," + HOverWorkTimes.ToString() + "," + HBasePay.ToString() +
+ ")");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Pay_PeriodInfoSet set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Pay_PeriodInfoSet set " +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HYear=" + HYear +
+ ",HPeriod=" + HPeriod +
+ ",HWorkTimes=" + HWorkTimes +
+ ",HOverWorkTimes=" + HOverWorkTimes +
+ ",HBasePay=" + HBasePay +
+ ", HRemark = '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Pay_PeriodInfoSet set HEndflag=0 where HItemID=" + HItemID, 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("DeltetPay_PeriodInfoSet")]
+ [HttpGet]
+ public object DeltetPay_PeriodInfoSet(string HItemID)
+ {
+ DataSet ds;
+ DataSet ds1;
+ //string ModRightNameCheck = "Sc_ProcessReport_check";
+ 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 Pay_PeriodInfoSet where HItemID=" + HItemID, "Gy_Group");
+ if (ds == null || ds.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 Pay_PeriodInfoSet 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;
+ }
+ }
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Group where HItemID=" + HInterID, "Gy_Group");
+
+ 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;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index 6baaaa8..b41c069 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -25,7 +25,7 @@
/// </summary>
[Route("Xt_ORGANIZATIONS/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere, string Organization)
{
try
{
@@ -39,22 +39,11 @@
string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -85,12 +74,12 @@
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
-
+
long HParentID = list[0].HParentID;
-
+
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
-
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -203,7 +192,7 @@
",HStopflag,HMakeTime" +
",HRemark) " +
" Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
- "," + HStopflag + "getdate()"+
+ "," + HStopflag + "getdate()" +
",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
@@ -246,7 +235,7 @@
/// </summary>
/// <returns></returns>
[Route("DeltetXt_ORGANIZATIONSList")]
-
+
[HttpGet]
public object DeltetXt_ORGANIZATIONSList(string HItemID)
{
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 45d7371..fc9384c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -35,7 +35,7 @@
bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
if (!isCgjl)
{
- sWhere += " and HEmpID in (select HEmpID from Gy_Czygl where Czymc='Admin' )";
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
}
string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
@@ -113,6 +113,34 @@
}
+ /// <summary>
+ /// 閲囪喘璁㈠崟 鎾ら攢
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cg_POOrderBill/Back")]
+ [HttpGet]
+ public object Back(string Hmainid)
+ {
+ try
+ {
+ string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 2 where HInterID in ({Hmainid})";
+ oCN.RunProc(sql);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 閲囪喘璁㈠崟 浼樺厛绾�
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
new file mode 100644
index 0000000..e52323c
--- /dev/null
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -0,0 +1,298 @@
+锘縰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
+{
+ public class GG_NoticeController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DLL.ClsOA_InformBill BillNew0 = new DLL.ClsOA_InformBill(); //鍏憡鍒楄〃瀵瑰簲鍗曟嵁绫诲瀷
+ public DLL.ClsOA_InformBill BillOld0 = new DLL.ClsOA_InformBill(); //鍏憡鍒楄〃瀵瑰簲鍗曟嵁绫诲瀷
+
+ #region 鍏憡鍒楄〃
+
+ [Route("GG_Notice/Get_GG_NoticeBillList")]
+ [HttpGet]
+ public object Get_GG_NoticeBillList(string sWhere, string user)
+ {
+ try
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ ds = Get_GG_NoticeBillList(sWhere);
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ 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 Get_GG_NoticeBillList(string sWhere)
+ {
+ var sql = "select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '鏈槄' when B.HReadFlag=1 then '宸查槄' end HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate" +
+ " from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "OA_InformBillMain");
+ }
+
+ #endregion
+
+ #region 鍏憡鍒楄〃缂栬緫鑾峰彇鏁版嵁
+ [Route("GG_Notice/GG_NoticeBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> GG_NoticeBillListCheckDetai(string HID,string HEntryID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ var dataSet = oCN.RunProcReturn("select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '鏈槄' when B.HReadFlag=1 then '宸查槄' end HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate" +
+ " from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where A.HInterID='"+ HID + "' and b.HEntryID='"+HEntryID+"'", "OA_InformBillMain");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region 鍏憡鍒楄〃淇濆瓨/缂栬緫
+ /// <summary>
+ /// 鍏憡鍒楄〃
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("GG_Notice/SaveGetGG_NoticeBillList")]
+ [HttpPost]
+ public object SaveGetGG_NoticeBillList([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 refSav = sArray[1].ToString();
+ string msg3 = sArray[2].ToString();
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg3))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DLL.ClsOA_InformBill oBill = new DLL.ClsOA_InformBill();
+ List<Models.ClsOA_InformBillMain> lsmain = new List<Models.ClsOA_InformBillMain>();
+ List<Models.ClsOA_InformBillSub> lssub = new List<Models.ClsOA_InformBillSub>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_GG_NoticeBillMain(msg2);
+ foreach (Models.ClsOA_InformBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld0.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld0.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HMaker = msg3; //鍒跺崟浜�
+ oItem.HBillType = "4506";
+ oItem.HBillSubType = "4506";
+ 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"));
+ string[] arrStr = oItem.HReceiveMan.Split(',');
+ oBill.omodel = oItem;
+ //琛ㄤ綋鏁版嵁
+ for (int i = 1; i <=arrStr.Length; i++)
+ {
+
+ Models.ClsOA_InformBillSub sb = new Models.ClsOA_InformBillSub();
+ sb.HEntryID = i;
+ sb.HCloseMan = "";
+ sb.HRemark = "";
+ sb.HSourceBillNo = "";
+ sb.HSourceInterID = 0;
+ sb.HSourceEntryID = 0;
+ sb.HSourceBillType = "";
+ sb.HRelationQty = 0;
+ sb.HRelationMoney = 0;
+ sb.HReceiveMan = arrStr[i-1];
+ oBill.DetailColl.Add(sb);
+ }
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍏憡鍒楄〃鍒犻櫎
+ [Route("GG_Notice/Get_GG_Notice_DeleteBill")]
+ [HttpGet]
+ public object Get_GG_Notice_DeleteBill(string HInterID, string user)
+ {
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("", 1, true, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ oCN.RunProc("delete from OA_InformBillSub where HInterID=" + HInterID);
+ oCN.RunProc("delete from OA_InformBillMain where HInterID=" + HInterID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏憡鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏憡鏁版嵁鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 6315e17..dc37059 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1,10 +1,13 @@
-锘縰sing System;
+锘縰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 System.Web.UI.WebControls;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -3351,5 +3354,187 @@
#endregion
#endregion
+
+ #region 鐢ㄦ埛鍏宠仈鏉冮檺
+
+ #region 鏉′欢鏌ヨ鏉冮檺鍒楄〃
+ [Route("PublicPageMethod/PowerList")]
+ [HttpGet]
+ public object PowerList(string czybm,string sGnbm)
+ {
+ try
+ {
+ string sName = "";
+ if (sGnbm != "" && sGnbm != null)
+ {
+ if (sGnbm == "鏉冮檺绠＄悊-鐢ㄦ埛")
+ {
+ sName = "";
+ }
+ else {
+ sName = sGnbm;
+ }
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Czygl where czybm='" + czybm + "'", "Gy_Czygl");
+ string AuthorityID = ClsPub.isStrNull(ds.Tables[0].Rows[0]["AuthorityID"]);
+ ds = oCN.RunProcReturn("SELECT id hid,case when id<=" + AuthorityID.Length + " then case when SUBSTRING('" + AuthorityID + "',id,1)=1 then 1 else 0 end else 0 end AuthorityID,'' AuthorityHID, gnms ,gnbm hgnbm FROM xt_xtgnb where useflag=1 and sjgnbm='" + sName + "' and rightflag=1 order by gnbm", "xt_xtgnb");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲姛鑳藉垪琛ㄦ暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃鍔熻兘鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/PowerLoadTree")]
+ [HttpGet]
+ public object PowerLoadTree()
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select '鏉冮檺绠＄悊-鐢ㄦ埛' id,'' HNumber,'鏉冮檺绠＄悊--鐢ㄦ埛' title,'' ParentID
+ union all
+ select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠＄悊--鐢ㄦ埛' else sjgnbm end ParentID from Xt_Xtgnb where sjgnbm=''
+ union all
+ Select gnbm id,gnsy HNumber,gnmc as title,sjgnbm as ParentID
+ from Xt_Xtgnb where mjbz=0 and useflag=1 and rightflag=1 and sjgnbm in(
+ select gnbm from Xt_Xtgnb where mjbz=0 and useflag=1 and rightflag=1
+ ) ");
+ ds = oCN.RunProcReturn(sql, "Xt_Xtgnb");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲姛鑳藉垪琛ㄦ暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈鏉冮檺鎻愪氦
+ [Route("Gy_MaintenanceMode/SaverPower")]
+ [HttpPost]
+ public object SaverPower([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ List<Models.UserPower> lsmain = new List<Models.UserPower>();
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_UserPower(msg3);
+ ds = oCN.RunProcReturn("select * from Gy_Czygl where czybm='" + msg4.Trim() + "'", "Gy_Czygl");
+ string AuthorityID = ClsPub.isStrNull(ds.Tables[0].Rows[0]["AuthorityID"]);
+ string Auth_str = AuthorityID;
+ string MKID = "";
+ int lENSTR = 0; //妯″潡ID
+ DataSet oDs = new DataSet();
+ for (int i = 0; i < lsmain.Count; i++)
+ {
+ MKID = ClsPub.isStrNull(lsmain[i].hid);
+ lENSTR = ClsPub.isInt(MKID.Substring(0, MKID.Length));
+ if (lsmain[i].AuthorityHID == "1")
+ {
+ for (int h = Auth_str.Trim().Length; h <= lENSTR - 1; h++)
+ {
+ Auth_str = Auth_str.Trim() + "0";
+ }
+
+ Auth_str = Auth_str.Substring(0, lENSTR - 1) + "1" + Auth_str.Substring(lENSTR, Auth_str.Length - lENSTR);
+ }
+ else
+ {
+ if (Auth_str.Length >= lENSTR)
+ {
+ Auth_str = Auth_str.Substring(0, lENSTR - 1) + "0" + Auth_str.Substring(lENSTR, Auth_str.Length - lENSTR);
+ }
+ }
+ oDs = oCN.RunProcReturn("select * from xt_xtgnb where useflag=1 and gnbm like '" + lsmain[i].hgnbm + "%'", "xt_xtgnb");
+ if (oDs.Tables[0].Rows.Count != 0)
+ {
+ for (int k = 0; k < oDs.Tables[0].Rows.Count; k++)
+ {
+ int ID = ClsPub.isInt(oDs.Tables[0].Rows[k]["id"]);
+ if (lsmain[i].AuthorityHID == "1")
+ {
+ if (lsmain[i].AuthorityHID == "1")
+ {
+ for (int h = Auth_str.Trim().Length; h <= ID - 1; h++)
+ {
+ Auth_str = Auth_str.Trim() + "0";
+ }
+ Auth_str = Auth_str.Substring(0, ID - 1) + "1" + Auth_str.Substring(ID, Auth_str.Length - ID);
+ }
+ }
+ else
+ {
+ if (Auth_str.Length >= ID)
+ {
+ Auth_str = Auth_str.Substring(0, ID - 1) + "0" + Auth_str.Substring(ID, Auth_str.Length - ID);
+ }
+ }
+ }
+ }
+ oDs = null;
+ }
+ oCN.RunProc("UPDATE Gy_Czygl SET AuthorityID='" + Auth_str + "' WHERE czybm='" + msg4.Trim() + "'");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎺堟潈鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data =null;
+ }
+ return objJsonResult;
+ }
+
+
+
+ #endregion
+
+ #endregion
+
}
}
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index 3ee1d4a..d3dd532 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -16,11 +16,9 @@
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();
- DataSet ds;
- SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN();
- DataSet ds1;
-
@@ -71,7 +69,228 @@
return objJsonResult;
}
}
+ #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> QC_OutCompCheckBillListCheckDetail(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_QC_OutCompCheckBillList where hmainid= " + HID + " ", "h_v_QC_OutCompCheckBillList");
+ 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("QC_OutCompCheckBill/QC_OutCompCheckBillListProjectDetai")]
+ [HttpGet]
+ public object QC_OutCompCheckBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT 鏃ユ湡,鍗曟嵁鍙�,琛ㄥご澶囨敞,瀹㈡埛鍚嶇О" +
+ ",瀹㈡埛浠ｇ爜,浜у搧鍐呯爜, 浜у搧鍚嶇О, 浜у搧鍨嬪彿, 妫�楠屽憳浠ｇ爜" +
+ ", 妫�楠屽憳鍚嶇О, 鍒跺崟浜�, 鍒跺崟鏃ユ湡, 瀹℃牳浜�, 瀹℃牳鏃ユ湡" +
+ ", 淇敼浜�, 淇敼鏃ユ湡, 鍏抽棴浜�, 鍏抽棴鏃ユ湡,鍗曟嵁绫诲瀷 FROM h_v_QC_OutCompCheckBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
+ 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
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_OutCompCheckBill/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<QC_OutCompCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillMain>>(msg2);
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HBillType = "7504";
+ string HBillSubType = "7504";
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HBillStatus = mainList[0].HBillStatus;
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ string HBacker = mainList[0].HBacker;
+ DateTime HBackDate = mainList[0].HBackDate;
+ string HBackRemark = mainList[0].HBackRemark;
+ string HChecker = mainList[0].HChecker;
+ DateTime HCheckDate = mainList[0].HCheckDate;
+ string HMaker = mainList[0].HMaker;
+ DateTime HMakeDate = mainList[0].HMakeDate;
+ long HCusID = mainList[0].HCusID;
+ long HMaterID = mainList[0].HMaterID;
+ long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
+ string HCheckerResult = mainList[0].HCheckerResult;
+ double HInStockQty = mainList[0].HInStockQty;
+ double HCheckQty = mainList[0].HCheckQty;
+ double HRightQty = mainList[0].HRightQTy;
+ double HBadQty = mainList[0].HBadQty;
+
+ //涓昏〃
+ oCN.RunProc("Insert Into QC_OutCompCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HCusID,HMaterID,HInStockQty,HCheckQty,HRightQty" +
+ ",HBadQty,HFirstCheckEmp,HCheckerResult" +
+ ") " +
+ " values('" + HBillType + "','" + HBillSubType + "'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",'" + HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "'" +
+ "," + HCusID.ToString() + "," + HMaterID.ToString() + "," + HInStockQty.ToString() + "," + HCheckQty.ToString() + "," + HRightQty.ToString() +
+ "," + HBadQty.ToString() + "," + HFirstCheckEmp.ToString() + ",'" + HCheckerResult + "'" +
+ ") ");
+
+
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID)
+ {
+ List<QC_OutCompCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillSub>>(msg3);
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ string HBillNo_bak = subList[0].HBillNo_bak;
+ long HEntryID = subList[0].HEntryID;//宸ユID
+ string HCloseMan = subList[0].HCloseMan;
+ long HCloseType = subList[0].HCloseType;
+ string HRemark = subList[0].HRemark;
+ long HSourceInterID = subList[0].HSourceInterID;
+ long HSourceEntryID = subList[0].HSourceEntryID;
+ string HSourceBillNo = subList[0].HSourceBillNo;
+ string HSourceBillType = subList[0].HSourceBillType;
+ double HRelationQty = subList[0].HRelationQty;
+ double HRelationMoney = subList[0].HRelationMoney;
+ long HQCCheckClassID = subList[0].HQCCheckClassID;
+ long HQCCheckItemID = subList[0].HQCCheckItemID;
+ string HQCStd = subList[0].HQCStd;
+ string HResult = subList[0].HResult;
+
+ oCN.RunProc("Insert into QC_OutCompCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
+ ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckClassID,HQCCheckItemID,HQCStd,HResult" +
+ ") values("
+ + HInterID.ToString() + ",'" + HBillNo_bak + "'," + HEntryID.ToString() + ",'" + HCloseMan + "'" +
+ ",getdate()," + HCloseType + ",'" + HRemark + "'," + HSourceInterID.ToString() +
+ "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
+ "," + HQCCheckClassID.ToString() + "," + HQCCheckItemID.ToString() + ",'" + HQCStd + "','" + HResult + "'" + ") ");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ /// <summary>
+ ///鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_OutCompCheckBill/DeltetOutCompCheckBill")]
+ [HttpGet]
+ public object DeltetOutCompCheckBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From QC_OutCompCheckBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_OutCompCheckBillSub 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/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ab01574..37c0a4a 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2242,7 +2242,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(mu);
return objJsonResult;
}
@@ -2250,7 +2250,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
objJsonResult.data = e.ToString();
return objJsonResult;
}
diff --git a/WebAPI/DLL/ClsOA_InformBill.cs b/WebAPI/DLL/ClsOA_InformBill.cs
new file mode 100644
index 0000000..e14af5a
--- /dev/null
+++ b/WebAPI/DLL/ClsOA_InformBill.cs
@@ -0,0 +1,229 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsOA_InformBill:DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsOA_InformBillMain omodel = new Models.ClsOA_InformBillMain();
+ public List<Models.ClsOA_InformBillSub> DetailColl = new List<Models.ClsOA_InformBillSub>();
+
+ public ClsOA_InformBill()
+ {
+ base.MvarItemKeySub = "OA_InformBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="OA_InformBillMain";
+ base.MvarReportTitle = "閫氱煡鏂囦欢";
+ base.BillType = "4506";
+ base.HBillSubType = "4506";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsOA_InformBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_InformBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HContext='" + omodel.HContext + "'" +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HSendMan ='" + omodel.HSendMan.ToString()+"'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsOA_InformBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into OA_InformBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HReceiveMan,HReadFlag " +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ",'" + oSub.HReceiveMan.ToString() + "'," + Convert.ToString(oSub.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+ //
+ //foreach (Model.ClsOA_InformBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_OA_InformBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ 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();
+ //涓昏〃
+ oCn.RunProc("Insert Into OA_InformBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HContext,HDeptID,HSendMan" +
+ ",HReceiveMan,HLevel,HDescription" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ",'" + omodel.HContext + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HSendMan.ToString() +
+ "','" + omodel.HReceiveMan + "','" + omodel.HLevel + "','" + omodel.HDescription + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsOA_InformBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into OA_InformBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HReceiveMan,HReadFlag " +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "',''," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ",'" + oSub.HReceiveMan.ToString() + "'," + Convert.ToString(oSub.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from OA_InformBillMain Where HInterID=" + lngBillKey.ToString(), "OA_InformBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HSendMan =Ds.Tables[0].Rows[0]["HSendMan"].ToString();
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HContext = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HContext"]);
+ omodel.HReceiveMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReceiveMan"]);
+ omodel.HLevel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLevel"]);
+ omodel.HDescription = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDescription"]);
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from OA_InformBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "OA_InformBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsOA_InformBillSub oSub = new Models.ClsOA_InformBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HReceiveMan = DsSub.Tables[0].Rows[i]["HReceiveMan"].ToString();
+ oSub.HReadFlag = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HReadFlag"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 331046b..c8796ba 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1650,5 +1650,28 @@
return list;
}
+ /// <summary>
+ /// 鍏憡鍒楄〃涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_InformBillMain> getObjectByJson_GG_NoticeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_InformBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_InformBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏉冮檺鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.UserPower> getObjectByJson_UserPower(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.UserPower> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.UserPower>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsOA_InformBillMain.cs b/WebAPI/Models/ClsOA_InformBillMain.cs
new file mode 100644
index 0000000..74840e5
--- /dev/null
+++ b/WebAPI/Models/ClsOA_InformBillMain.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsOA_InformBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public string HContext; // varchar(200) 主题
+ public Int64 HDeptID; // int --发送部门（h_v_IF_Department）
+ public string HSendMan; // int --发送人（h_v_IF_Employee）
+ public string HReceiveMan; // int --接收(可多选人)（h_v_IF_Employee）
+ public string HLevel; // varchar(10) --紧急程度（普通，紧急）
+ public string HDescription; // varchar(5000) --详细内容
+
+ }
+}
diff --git a/WebAPI/Models/ClsOA_InformBillSub.cs b/WebAPI/Models/ClsOA_InformBillSub.cs
new file mode 100644
index 0000000..b5b1d6b
--- /dev/null
+++ b/WebAPI/Models/ClsOA_InformBillSub.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsOA_InformBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HReceiveMan;// int 接收人（h_v_IF_Employee）
+ public bool HReadFlag;// bit //已阅标记（保存时默认为0）
+
+ }
+}
diff --git a/WebAPI/Models/Pay_PeriodInfoSet.cs b/WebAPI/Models/Pay_PeriodInfoSet.cs
new file mode 100644
index 0000000..c30d21d
--- /dev/null
+++ b/WebAPI/Models/Pay_PeriodInfoSet.cs
@@ -0,0 +1,26 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Pay_PeriodInfoSet
+ {
+ public long HItemID { get; set; }
+ public long HYear { get; set; }
+ public long HPeriod { get; set; }
+ public decimal HWorkTimes { get; set; }
+ public decimal HOverWorkTimes { get; set; }
+ public decimal HBasePay { get; set; }
+
+
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/QC_OutCompCheckBillSub.cs b/WebAPI/Models/QC_OutCompCheckBillSub.cs
index 607286d..8d5bb54 100644
--- a/WebAPI/Models/QC_OutCompCheckBillSub.cs
+++ b/WebAPI/Models/QC_OutCompCheckBillSub.cs
@@ -12,7 +12,7 @@
public long HEntryID { get; set; }
public string HCloseMan { get; set; }
public DateTime HEntryCloseDate { get; set; }
- public string HCloseType { get; set; }
+ public long HCloseType { get; set; }
public string HRemark { get; set; }
public long HSourceInterID { get; set; }
public long HSourceEntryID { get; set; }
diff --git a/WebAPI/Models/UserPower.cs b/WebAPI/Models/UserPower.cs
new file mode 100644
index 0000000..0dcccae
--- /dev/null
+++ b/WebAPI/Models/UserPower.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class UserPower
+ {
+ public string hgnbm { get; set; }
+ public string hid { get; set; }
+ public string AuthorityHID { get; set; }
+ public string AuthorityID { get; set; }
+ public string gnms { get; set; }
+ }
+
+}
\ No newline at end of file
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"
new file mode 100644
index 0000000..d49c5dd
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjSub.cs"
@@ -0,0 +1,32 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_ClassTimePrjSub
+ {
+ public long HInterID { get; set; }
+ public long HItemID { get; set; }
+
+ public string HName { get; set; }
+ public string HNumber { get; set; }
+ public long hparentid { get; set; }
+ public DateTime HYear { get; set; }
+ public decimal HPeriod { get; set; }
+ public decimal HSumMoney { get; set; }
+ public string HSumWorkTimes { get; set; }
+ public decimal HOldRate { get; set; }
+ public string HDayRate { get; set; }
+ public string HRate { get; set; }
+ public string HMaker { get; set; }
+ public DateTime HMakeDate { get; set; }
+
+ public string HChecker { get; set; }
+ public DateTime HCheckDate { get; set; }
+ public string HUseFlag { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1487a98..65246bf 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,44 +5,44 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-10-28T08:27:53.9728270Z;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-11-09T02:34:21.1623512Z;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>08/09/2021 15:55:25</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/11/2021 19:03:07</publishTime>
+ <publishTime>11/09/2021 10:33:55</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/11/2021 19:03:07</publishTime>
+ <publishTime>11/09/2021 10:33:55</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/11/2021 19:03:04</publishTime>
+ <publishTime>11/09/2021 10:33:51</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/11/2021 19:03:04</publishTime>
+ <publishTime>11/09/2021 10:33:51</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/11/2021 19:02:58</publishTime>
+ <publishTime>11/09/2021 10:33:47</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/11/2021 19:02:58</publishTime>
+ <publishTime>11/09/2021 10:33:47</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>08/09/2021 15:55:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
+ <publishTime>03/19/2015 01:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 11:48:56</publishTime>
+ <publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/11/2021 19:02:59</publishTime>
+ <publishTime>11/09/2021 10:33:48</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/11/2021 19:02:59</publishTime>
+ <publishTime>11/09/2021 10:33:48</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/03/2014 20:33:56</publishTime>
+ <publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/11/2021 19:02:54</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/11/2021 19:02:54</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/11/2021 19:02:55</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/11/2021 19:02:55</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/11/2021 19:02:56</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/11/2021 19:02:56</publishTime>
+ <publishTime>11/09/2021 10:33:45</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
+ <publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
+ <publishTime>08/19/2014 18:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
+ <publishTime>11/28/2018 21:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>11/28/2018 20:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
+ <publishTime>11/28/2018 21:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
+ <publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>01/28/2015 12:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>02/11/2014 23:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>01/28/2015 12:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
+ <publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/11/2021 19:03:13</publishTime>
+ <publishTime>11/09/2021 10:34:00</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/11/2021 19:03:13</publishTime>
+ <publishTime>11/09/2021 10:34:00</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
+ <publishTime>07/18/2013 01:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
+ <publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
+ <publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:23</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:23</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:23</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:23</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 19:50:53</publishTime>
+ <publishTime>11/01/2021 08:21:05</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 15:55:25</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/11/2021 19:04:02</publishTime>
+ <publishTime>11/09/2021 10:34:18</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e0a4616..0a09079 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,7 +278,9 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.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" />
<Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
@@ -349,6 +351,7 @@
<Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
+ <Compile Include="Controllers\GG_NoticeController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
<Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
@@ -401,6 +404,7 @@
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
<Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
+ <Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -445,6 +449,9 @@
<Compile Include="Models\ClsGy_Maintain.cs" />
<Compile Include="Models\ClsGy_Repair.cs" />
<Compile Include="Models\ClsGy_RepairCheck.cs" />
+ <Compile Include="Models\ClsOA_InformBillMain.cs" />
+ <Compile Include="Models\ClsOA_InformBillSub.cs" />
+ <Compile Include="Models\Pay_PeriodInfoSet.cs" />
<Compile Include="Models\Gy_OrderBackInfo.cs" />
<Compile Include="Models\Gy_OrderLevList.cs" />
<Compile Include="Models\ClsGy_EquipFileMain.cs" />
@@ -468,6 +475,7 @@
<Compile Include="Models\Gy_WorkPayType.cs" />
<Compile Include="Models\QC_POStockInCheckBillSub.cs" />
<Compile Include="Models\QC_POStockInCheckBill.cs" />
+ <Compile Include="Models\UserPower.cs" />
<Compile Include="Models\Xt_DataDictionary_Proc.cs" />
<Compile Include="Models\Xt_DataDictionary_View.cs" />
<Compile Include="Models\Xt_DataDictionary_Table.cs" />
@@ -551,6 +559,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
index 16a10b8..59ac710 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
@@ -525,8 +525,18 @@
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
//涓荤被璧嬪��
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationInTime.Text), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
BillNew.omodel.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
index 37d803f..c11f3ab 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
@@ -482,6 +482,7 @@
this.txtHBadPNL.Text = BillOld.omodel.HBadPNL.ToString();
this.txtHRemark.Text = BillOld.omodel.HRemark.ToString();
this.txtHWasterQty.Text = BillOld.omodel.HWasterQty.ToString();
+ this.txtHBadCount.Text = BillOld.omodel.HBadCount.ToString();
this.txtHQty.Text = BillOld.omodel.HQty.ToString();
this.txtHPieceQty.Text = BillOld.omodel.HPieceQty.ToString();
this.txtHPlanPieceQty.Text = BillOld.omodel.HPlanPieceQty.ToString();
@@ -750,8 +751,18 @@
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
//涓荤被璧嬪��
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationOutTime.Text), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
BillNew.omodel.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
@@ -782,6 +793,7 @@
BillNew.omodel.HOrderProcNO = DBUtility.ClsPub.isStrNull(this.txtHOrderProcNO.Text);
BillNew.omodel.HBadPNL = DBUtility.ClsPub.isDoule(this.txtHBadPNL.Text);
BillNew.omodel.HWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
+ BillNew.omodel.HBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
BillNew.omodel.HRemark = DBUtility.ClsPub.isStrNull(this.txtHRemark.Text);
BillNew.omodel.HLastSubProc = true;
BillNew.omodel.HMainSourceInterID = sHMainSourceInterID;
@@ -2480,5 +2492,71 @@
{
this.Sub_AddBill();
}
+
+ //鎶ュ簾鍝佽川纭鎸夐挳
+ private void cmdBFChecker_Click(object sender, EventArgs e)
+ {
+ QC_NoPassProdCheckBill oBF = new QC_NoPassProdCheckBill();
+ oBF.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oBF.HMainSourceInterID = BillOld.omodel.HInterID;
+ oBF.HProcExchInterID = lngBillKey;
+ oBF.HProcExchEntryID = lngBillSubKey;
+ oBF.HBillSubType = "鎶ュ簾璇勫";
+ oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
+ oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
+ oBF.txtHMaterID.Text = txtHMaterName.Text;
+ oBF.txtHMaterNumber.Text = txtHMaterID.Text;
+ oBF.txtHModel.Text = txtHMaterModel.Text;
+ oBF.txtHMaterID.Tag = txtHMaterID.Tag;
+ oBF.txtHProcID.Tag = txtHProcID.Tag;
+ oBF.txtHProcID.Text = txtHProcID.Text;
+ oBF.txtHWorkCenterID.Text = "";
+ oBF.txtHWorkCenterID.Tag = 0;
+ oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
+ oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
+ oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
+ oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
+ oBF.ShowDialog();
+ if (oBF.BillChange)
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //涓嶈壇鍝佽川纭鎸夐挳
+ private void cmdChecker_Click(object sender, EventArgs e)
+ {
+ QC_NoPassProdCheckBill oBF = new QC_NoPassProdCheckBill();
+ oBF.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oBF.HMainSourceInterID = BillOld.omodel.HInterID;
+ oBF.HProcExchInterID = lngBillKey;
+ oBF.HProcExchEntryID = lngBillSubKey;
+ oBF.HBillSubType = "涓嶈壇璇勫";
+ oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
+ oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
+ oBF.txtHMaterID.Text = txtHMaterName.Text;
+ oBF.txtHMaterNumber.Text = txtHMaterID.Text;
+ oBF.txtHModel.Text = txtHMaterModel.Text;
+ oBF.txtHMaterID.Tag = txtHMaterID.Tag;
+ oBF.txtHProcID.Tag = txtHProcID.Tag;
+ oBF.txtHProcID.Text = txtHProcID.Text;
+ oBF.txtHWorkCenterID.Text = "";
+ oBF.txtHWorkCenterID.Tag = 0;
+ oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
+ oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
+ oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.ShowDialog();
+ if (oBF.BillChange)
+ {
+ this.Sub_ShowBill();
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
index 8343057..eb5bfc5 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
@@ -114,6 +114,7 @@
this.cmdAddNew = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
+ this.cmdXZ = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
@@ -122,7 +123,10 @@
this.cmdCancel = new System.Windows.Forms.Button();
this.cmdOK = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
- this.cmdXZ = new System.Windows.Forms.Button();
+ this.cmdBFChecker = new System.Windows.Forms.Button();
+ this.cmdChecker = new System.Windows.Forms.Button();
+ this.txtHBadCount = new System.Windows.Forms.TextBox();
+ this.label34 = new System.Windows.Forms.Label();
this.gbUp.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
@@ -288,7 +292,7 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(333, 66);
+ this.label4.Location = new System.Drawing.Point(333, 39);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(84, 21);
this.label4.TabIndex = 91;
@@ -511,9 +515,9 @@
this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
this.groupBox1.Location = new System.Drawing.Point(688, 80);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
this.groupBox1.Size = new System.Drawing.Size(251, 417);
this.groupBox1.TabIndex = 183;
this.groupBox1.TabStop = false;
@@ -524,7 +528,7 @@
this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdCardList.Location = new System.Drawing.Point(2, 21);
- this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(2);
this.grdCardList.Name = "grdCardList";
this.grdCardList.RowHeadersWidth = 51;
this.grdCardList.RowTemplate.Height = 27;
@@ -537,7 +541,7 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Left;
this.tabControl1.Location = new System.Drawing.Point(3, 80);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(685, 417);
@@ -546,6 +550,8 @@
// tabPage1
//
this.tabPage1.BackColor = System.Drawing.Color.Gray;
+ this.tabPage1.Controls.Add(this.txtHBadCount);
+ this.tabPage1.Controls.Add(this.label34);
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.label32);
this.tabPage1.Controls.Add(this.label22);
@@ -589,9 +595,9 @@
this.tabPage1.Controls.Add(this.label7);
this.tabPage1.Controls.Add(this.label9);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(2);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(2);
this.tabPage1.Size = new System.Drawing.Size(677, 387);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍩烘湰淇℃伅";
@@ -639,7 +645,7 @@
this.txtHRemark.Location = new System.Drawing.Point(122, 336);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(496, 43);
+ this.txtHRemark.Size = new System.Drawing.Size(190, 43);
this.txtHRemark.TabIndex = 140;
//
// txtHWWWorkOrderBillNo
@@ -721,9 +727,9 @@
this.label29.ForeColor = System.Drawing.Color.Yellow;
this.label29.Location = new System.Drawing.Point(16, 258);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(106, 21);
+ this.label29.Size = new System.Drawing.Size(90, 21);
this.label29.TabIndex = 160;
- this.label29.Text = "涓嶅悎鏍兼暟閲忥細";
+ this.label29.Text = "鎶ュ簾鏁伴噺锛�";
//
// txtHMoney
//
@@ -938,9 +944,9 @@
this.tabPage2.Controls.Add(this.cmdHGroupID);
this.tabPage2.Controls.Add(this.cmdHSourceID);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
this.tabPage2.Size = new System.Drawing.Size(677, 387);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍏朵粬淇℃伅";
@@ -1094,7 +1100,7 @@
this.label15.BackColor = System.Drawing.Color.Gray;
this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.ForeColor = System.Drawing.Color.Yellow;
- this.label15.Location = new System.Drawing.Point(333, 31);
+ this.label15.Location = new System.Drawing.Point(333, 71);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(90, 21);
this.label15.TabIndex = 133;
@@ -1119,7 +1125,7 @@
this.panel3.Controls.Add(this.lblCaption);
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
this.panel3.Location = new System.Drawing.Point(3, 19);
- this.panel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.panel3.Margin = new System.Windows.Forms.Padding(2);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(936, 61);
this.panel3.TabIndex = 169;
@@ -1211,6 +1217,8 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.cmdBFChecker);
+ this.panel1.Controls.Add(this.cmdChecker);
this.panel1.Controls.Add(this.cmdXZ);
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.button2);
@@ -1229,12 +1237,22 @@
this.panel1.Size = new System.Drawing.Size(942, 65);
this.panel1.TabIndex = 116;
//
+ // cmdXZ
+ //
+ this.cmdXZ.Location = new System.Drawing.Point(18, 10);
+ this.cmdXZ.Name = "cmdXZ";
+ this.cmdXZ.Size = new System.Drawing.Size(70, 40);
+ this.cmdXZ.TabIndex = 166;
+ this.cmdXZ.Text = "鏂� 澧�";
+ this.cmdXZ.UseVisualStyleBackColor = true;
+ this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
+ //
// button3
//
- this.button3.Location = new System.Drawing.Point(641, 10);
- this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.button3.Location = new System.Drawing.Point(634, 10);
+ this.button3.Margin = new System.Windows.Forms.Padding(2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(70, 42);
+ this.button3.Size = new System.Drawing.Size(70, 40);
this.button3.TabIndex = 151;
this.button3.Text = "鎵撳嵃";
this.button3.UseVisualStyleBackColor = true;
@@ -1244,9 +1262,9 @@
// button2
//
this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(552, 10);
+ this.button2.Location = new System.Drawing.Point(557, 10);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(70, 42);
+ this.button2.Size = new System.Drawing.Size(70, 40);
this.button2.TabIndex = 148;
this.button2.Text = "鍙嶅鏍�";
this.button2.UseVisualStyleBackColor = true;
@@ -1255,9 +1273,9 @@
// button1
//
this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(463, 10);
+ this.button1.Location = new System.Drawing.Point(480, 10);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(70, 42);
+ this.button1.Size = new System.Drawing.Size(70, 40);
this.button1.TabIndex = 147;
this.button1.Text = "瀹� 鏍�";
this.button1.UseVisualStyleBackColor = true;
@@ -1265,7 +1283,7 @@
//
// cmdDelBill
//
- this.cmdDelBill.Location = new System.Drawing.Point(196, 10);
+ this.cmdDelBill.Location = new System.Drawing.Point(716, 14);
this.cmdDelBill.Name = "cmdDelBill";
this.cmdDelBill.Size = new System.Drawing.Size(70, 42);
this.cmdDelBill.TabIndex = 146;
@@ -1276,9 +1294,9 @@
//
// cmdXG
//
- this.cmdXG.Location = new System.Drawing.Point(107, 10);
+ this.cmdXG.Location = new System.Drawing.Point(95, 10);
this.cmdXG.Name = "cmdXG";
- this.cmdXG.Size = new System.Drawing.Size(70, 42);
+ this.cmdXG.Size = new System.Drawing.Size(70, 40);
this.cmdXG.TabIndex = 121;
this.cmdXG.Text = "淇� 鏀�";
this.cmdXG.UseVisualStyleBackColor = true;
@@ -1286,9 +1304,9 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(374, 10);
+ this.cmdCancel.Location = new System.Drawing.Point(403, 10);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(70, 42);
+ this.cmdCancel.Size = new System.Drawing.Size(70, 40);
this.cmdCancel.TabIndex = 110;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -1296,9 +1314,9 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(285, 10);
+ this.cmdOK.Location = new System.Drawing.Point(326, 10);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(70, 42);
+ this.cmdOK.Size = new System.Drawing.Size(70, 40);
this.cmdOK.TabIndex = 109;
this.cmdOK.Text = "鎺� 鏀�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -1313,15 +1331,49 @@
this.panel2.Size = new System.Drawing.Size(942, 500);
this.panel2.TabIndex = 117;
//
- // cmdXZ
+ // cmdBFChecker
//
- this.cmdXZ.Location = new System.Drawing.Point(18, 10);
- this.cmdXZ.Name = "cmdXZ";
- this.cmdXZ.Size = new System.Drawing.Size(70, 42);
- this.cmdXZ.TabIndex = 166;
- this.cmdXZ.Text = "鏂� 澧�";
- this.cmdXZ.UseVisualStyleBackColor = true;
- this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
+ this.cmdBFChecker.Location = new System.Drawing.Point(172, 10);
+ this.cmdBFChecker.Name = "cmdBFChecker";
+ this.cmdBFChecker.Size = new System.Drawing.Size(70, 40);
+ this.cmdBFChecker.TabIndex = 168;
+ this.cmdBFChecker.Text = "鎶ュ簾鍝佽川纭";
+ this.cmdBFChecker.UseVisualStyleBackColor = true;
+ this.cmdBFChecker.Click += new System.EventHandler(this.cmdBFChecker_Click);
+ //
+ // cmdChecker
+ //
+ this.cmdChecker.Location = new System.Drawing.Point(249, 10);
+ this.cmdChecker.Name = "cmdChecker";
+ this.cmdChecker.Size = new System.Drawing.Size(70, 40);
+ this.cmdChecker.TabIndex = 167;
+ this.cmdChecker.Text = "涓嶈壇鍝佽川纭";
+ this.cmdChecker.UseVisualStyleBackColor = true;
+ this.cmdChecker.Click += new System.EventHandler(this.cmdChecker_Click);
+ //
+ // txtHBadCount
+ //
+ this.txtHBadCount.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadCount.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBadCount.ForeColor = System.Drawing.Color.Green;
+ this.txtHBadCount.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadCount.Location = new System.Drawing.Point(440, 336);
+ this.txtHBadCount.Name = "txtHBadCount";
+ this.txtHBadCount.Size = new System.Drawing.Size(190, 28);
+ this.txtHBadCount.TabIndex = 169;
+ this.txtHBadCount.TabStop = false;
+ this.txtHBadCount.Tag = "0";
+ //
+ // label34
+ //
+ this.label34.AutoSize = true;
+ this.label34.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label34.ForeColor = System.Drawing.Color.Yellow;
+ this.label34.Location = new System.Drawing.Point(328, 340);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(106, 21);
+ this.label34.TabIndex = 168;
+ this.label34.Text = "涓嶈壇鍝佹暟閲忥細";
//
// MES_StationEntrustOutBill
//
@@ -1452,5 +1504,9 @@
private System.Windows.Forms.TextBox txtHBarCode;
private System.Windows.Forms.Label label33;
private System.Windows.Forms.Button cmdXZ;
+ private System.Windows.Forms.Button cmdBFChecker;
+ private System.Windows.Forms.Button cmdChecker;
+ private System.Windows.Forms.TextBox txtHBadCount;
+ private System.Windows.Forms.Label label34;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
index 6301b09..bef2ad8 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
@@ -557,8 +557,18 @@
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
//涓荤被璧嬪��
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationInTime.Text), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
BillNew.omodel.HICMOInterID = DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
index 1fbb721..c699816 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
@@ -674,8 +674,18 @@
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
//涓荤被璧嬪��
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationOutTime.Text), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
BillNew.omodel.HICMOInterID = DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);
@@ -1613,7 +1623,7 @@
oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
- oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
--
Gitblit v1.9.1