From 19886bc3674e116fa7a26e12e11d5300732389d2 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 06 十二月 2021 17:35:43 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 148 +-
WebAPI/WebAPI.csproj.user | 2
WebAPI/Models/工资管理/ClsPay_SingleBalBillSub.cs | 42
WorkM/流转卡管理/Sc_ProcessExchangeBackBill.designer.cs | 524 ++++----
WebAPI/Controllers/工资管理/Pay_OtherBalBillController.cs | 369 ++++++
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 452 +++++++
WorkM/流转卡管理/Sc_ProcessExchangeBackBill.resx | 56
WebAPI/DLL/工资管理/ClsPay_SingleBalBill.cs | 12
WebAPI/Models/工资管理/ClsPay_OtherBalBillMain.cs | 16
WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs | 15
WebAPI/DLL/工资管理/ClsPay_OtherBalBill.cs | 20
WebAPI/Models/工资管理/ClsPay_SingleBalBillMain.cs | 17
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 7
WebAPI/Controllers/BLL/Xt_UserController.cs | 2
WebAPI/Models/工资管理/ClsPay_OtherBalBillSub.cs | 40
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 109 +
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 4
WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs | 26
WebAPI/Controllers/PublicPageMethodController.cs | 38
/dev/null | 339 -----
WebAPI/ListModels.cs | 80
WebAPI/Controllers/Pay_GroupBalBillController.cs | 159 --
WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs | 371 ++++++
WebAPI/Models/ClsOA_ErrMsgBackBillSub2.cs | 15
WebAPI/WebAPI.csproj | 18
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | 311 +++++
WebAPI/DLL/工资管理/ClsPay_GroupBalBill.cs | 356 +++++
28 files changed, 2,591 insertions(+), 959 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 1a8f780..317a662 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -771,6 +771,13 @@
omodel.Sc_MaterToSourceBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=========异常反馈单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_AutoCheck")
+ {
+ omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//=========工序进站接收单
//自动新增
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index d12b348..e3a8864 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -217,6 +217,8 @@
public string Sc_MaterToSourceBill_AutoCheck; //自动审核
public string Sc_MaterToSourceBill_MouldLifeCtrl; //保存时器具寿命控制 （Y 控制， N 不控制 当器具预计寿命或者当前寿命不足时，不允许上料）
public string Sc_MaterToSourceBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
+ //异常反馈单
+ public string OA_ErrMsgBackBill_AutoCheck; //自动审核
//QMS
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 6f248cd..617716e 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -130,7 +130,7 @@
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_IF_UserList_Edit where 鐢ㄦ埛缂栫爜= " + HID + " ", "h_v_IF_UserList_Edit");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_IF_UserList_Edit where 鐢ㄦ埛缂栫爜='" + HID + "' ", "h_v_IF_UserList_Edit");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ鐢ㄦ埛" };
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 1e23516..3ae5837 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -93,79 +93,90 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
string s = "";
Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- if (lngBillKey == 0)
+ try
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HBillStatus > 1)
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null)
+ DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s + "锛屼笉鍏佽鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
- }
- bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "1:" + lngBillKey;
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0:" + lngBillKey;
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
objJsonResult.data = null;
return objJsonResult;
}
}
- else
+ catch (Exception e)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "0:"+ lngBillKey;
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.Message = e.Message;
objJsonResult.data = null;
return objJsonResult;
}
+
}
#endregion
diff --git a/WebAPI/Controllers/Pay_GroupBalBillController.cs b/WebAPI/Controllers/Pay_GroupBalBillController.cs
index 1a6dd6a..69329ae 100644
--- a/WebAPI/Controllers/Pay_GroupBalBillController.cs
+++ b/WebAPI/Controllers/Pay_GroupBalBillController.cs
@@ -113,164 +113,7 @@
return objJsonResult;
}
#endregion
- /// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Pay_GroupBalBill/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 = "鏂板鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = null;
- 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<Pay_GroupBalBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_GroupBalBill>>(msg2);
- string HBillType = "2202";
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
- string HRemark = mainList[0].HRemark;//澶囨敞
- string HBillSubType = "2202";
- string HMaker = mainList[0].HMaker;
- string HExplanation = "0";
- string HInnerBillNo = "0";
- long HMaterID = mainList[0].HMaterID;//浜у搧ID
- long HGroupID = mainList[0].HGroupID;
- long HDeptID = mainList[0].HDeptID;
- long HProcID = mainList[0].HProcID;
- decimal HOtherSubsidy = mainList[0].HOtherSubsidy;
- decimal HOtherDeduct = mainList[0].HOtherDeduct;
- decimal HSumMoney = mainList[0].HSumMoney;
- decimal HPayMoney = mainList[0].HPayMoney;
- long HEmpID = mainList[0].HEmpID;
- long HPayType = mainList[0].HPayType;
- //long HMaterTypeID = 0;
- int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
-
- //涓昏〃
- oCN.RunProc("Insert Into Pay_GroupBalBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HGroupID,HDeptID,HPayType,HOtherSubsidy" +
- ",HOtherDeduct,HSumMoney,HPayMoney" +
- ",HExplanation,HInnerBillNo" +
- ") " +
- " values('" + HBillType + "','" + HBillSubType + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HDate + "'" +
- ", " + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ", " + HGroupID.ToString() + "," + HDeptID.ToString() + "," + HPayType.ToString() + "," + HOtherSubsidy.ToString() +
- "," + HOtherDeduct.ToString() + "," + HSumMoney.ToString() + "," + HPayMoney.ToString() +
- ",'" + HExplanation + "','" + HInnerBillNo + "'" +
- ") ");
-
- //淇濆瓨瀛愯〃
- 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<Pay_GroupBalBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_GroupBalBillSub>>(msg3);
- for (int i = 0; i < subList.ToArray().Length; i++)
- {
- long HEntryID = subList[0].HEntryID;//宸ユID
- 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;
- decimal HRelationQty = subList[0].HRelationQty;
- decimal HRelationMoney = subList[0].HRelationMoney;
- long HSourceID = subList[0].HSourceID;
- long HSqty = subList[0].HSqty;
- long HMaterID = subList[0].HMaterID;
- long HProcID = subList[0].HProcID;
- long HUnitID = subList[0].HUnitID;
- decimal HTimes = subList[0].HTimes;
- decimal HQty = subList[0].HQty;
- decimal HPrice = subList[0].HPrice;
- decimal HMoney = subList[0].HMoney;
- long HICMOInterID = subList[0].HICMOInterID;
- string HICMOBillNo = subList[0].HICMOBillNo;
- long HProcReportInterID = subList[0].HProcReportInterID;
- long HProcReportEntryID = subList[0].HProcReportEntryID;
- long HProcPlanInterID = subList[0].HProcPlanInterID;
- long HProcPlanEntryID = subList[0].HProcPlanEntryID;
- string HProcReportBillNo = subList[0].HProcReportBillNo;
- string HProcPlanBillNo = subList[0].HProcPlanBillNo;
-
- string sql = "Insert into Pay_GroupBalBillSub " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
- ") values("
- + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HRemark + "'" +
- "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
- "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HProcID.ToString() + "," + HTimes.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HSourceID.ToString() +
- "," + HMoney.ToString() + "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcReportInterID.ToString() + "," + HProcReportEntryID.ToString() + ",'" + HProcReportBillNo + "'" +
- "," + HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'," + HSqty.ToString() +
- ") ";
- oCN.RunProc(sql);
- }
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
- }
+
/// <summary>
///宸ヨ祫缁撶畻涓汉鍗曞垹闄ゅ姛鑳�
/// </summary>
diff --git a/WebAPI/Controllers/Pay_OtherBalBillController.cs b/WebAPI/Controllers/Pay_OtherBalBillController.cs
deleted file mode 100644
index 048d664..0000000
--- a/WebAPI/Controllers/Pay_OtherBalBillController.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers
-{
-
- public class Pay_OtherBalBillController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- public DataSet ds = new DataSet();
- public WebServer webserver = new WebServer();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- //DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Pay_OtherBalBill/GetOtherBalBill")]
- [HttpGet]
- public object GetOtherBalBill(string sWhere)
- {
- try
- {
-
- ds = Sc_GetOtherBalBill(sWhere);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception ex)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- public static DataSet Sc_GetOtherBalBill(string sWhere)
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by 鏃ユ湡 desc", "h_v_Pay_OtherBalBillList");
- }
- else
- {
- string sql1 = "select * from h_v_Pay_OtherBalBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
- return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
- }
-
- }
-
- #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- [Route("Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail")]
- [HttpGet]
- public ApiResult<DataSet> Pay_OtherBalBillListCheckDetail(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_Pay_OtherBalBillList where hmainid= " + HID + " ", "h_v_Pay_OtherBalBillList");
- 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("Pay_OtherBalBill/Pay_OtherBalBillListProjectDetai")]
- [HttpGet]
- public object Pay_OtherBalBillListProjectDetai(string sqlWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
- ",HGroupID,鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
- ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
- ",HEmpID,HEmpNumber,HEmpName,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 FROM h_v_Pay_OtherBalBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
- 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("Pay_OtherBalBill/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 = "鏂板鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = null;
- 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<Pay_OtherBalBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_OtherBalBill>>(msg2);
- string HBillType = "2206";
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
- string HRemark = mainList[0].HRemark;//澶囨敞
- string HBillSubType = "2206";
- string HMaker = mainList[0].HMaker;
- string HExplanation = "0";
- string HInnerBillNo = "0";
- long HMaterID = mainList[0].HMaterID;//浜у搧ID
- long HGroupID = mainList[0].HGroupID;
- long HDeptID = mainList[0].HDeptID;
- long HProcID = mainList[0].HProcID;
- long HEmpID = mainList[0].HEmpID;
- long HPayType = mainList[0].HPayType;
- //long HMaterTypeID = 0;
- int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
-
- //涓昏〃
- oCN.RunProc(" Insert Into Pay_OtherBalBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker" +
- ",HGroupID,HDeptID,HEmpID,HPayType,HInnerBillNo,HExplanation" + ")" +
- "values('" + HBillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "','" + HDate +
- "','" + HYear + "'," + HPeriod + ",'" + HRemark + "','" + HMaker + "'," + HGroupID + ", " + HDeptID +
- "," + HEmpID + ",'" + HPayType + "','" + HInnerBillNo + "'," + HExplanation +
- ") ");
- //淇濆瓨瀛愯〃
- 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<Pay_OtherBalBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_OtherBalBillSub>>(msg3);
- for (int i = 0; i < subList.ToArray().Length; i++)
- {
- 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;
- decimal HRelationQty = subList[0].HRelationQty;
- decimal HRelationMoney = subList[0].HRelationMoney;
- long HSourceID = subList[0].HSourceID;
- long HSqty = subList[0].HSqty;
- long HSubsidyID = subList[0].HSubsidyID;
- long HDeuctID = subList[0].HDeuctID;
- long HMaterID = subList[0].HMaterID;
- long HProcID = subList[0].HProcID;
- long HEmpID = subList[0].HEmpID;
- decimal HTimes = subList[0].HTimes;
- decimal HQty = subList[0].HQty;
- decimal HPrice = subList[0].HPrice;
- decimal HPackQty = subList[0].HPackQty;
- decimal HPackPrice = subList[0].HPackPrice;
- decimal HPackMoney = subList[0].HPackMoney;
- long HPackMaterID = subList[0].HPackMaterID;
- decimal HPriceRate = subList[0].HPriceRate;
- decimal HSubsidyTotal = subList[0].HSubsidyTotal;
- decimal HDeuctTotal = subList[0].HDeuctTotal;
- decimal HSubsidyQty = subList[0].HSubsidyQty;
- decimal HSubsidyMoney = subList[0].HSubsidyMoney;
- decimal HMoney = subList[0].HMoney;
- long HICMOInterID = subList[0].HICMOInterID;
- string HICMOBillNo = subList[0].HICMOBillNo;
- long HProcReportInterID = subList[0].HProcReportInterID;
- long HProcReportEntryID = subList[0].HProcReportEntryID;
- long HProcPlanInterID = subList[0].HProcPlanInterID;
- long HProcPlanEntryID = subList[0].HProcPlanEntryID;
- string HProcReportBillNo = subList[0].HProcReportBillNo;
- string HProcPlanBillNo = subList[0].HProcPlanBillNo;
-
- string sql = "Insert into Pay_OtherBalBillSub " +
- " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
- ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" +
- ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" +
- ") values("
- + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HCloseMan + "',''," + HCloseType + ",'" + HRemark + "'" +
- "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
- "," + HMaterID.ToString() + "," + HProcID.ToString() + "," + HEmpID.ToString() + "," + HSourceID.ToString()
- + "," + HTimes.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HSqty.ToString() +
- "," + HMoney.ToString() + "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcReportInterID.ToString() + "," + HProcReportEntryID.ToString() + ",'" + HProcReportBillNo + "'" +
- "," + HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'" +
- "," + HPriceRate.ToString() + "," + HSubsidyTotal.ToString() + "," + HDeuctTotal.ToString() + "," + HSubsidyID.ToString() + "," + HDeuctID.ToString() +
- "," + HPackQty.ToString() + "," + HPackPrice.ToString() + "," + HPackMoney.ToString() + "," + HPackMaterID.ToString() + "," + HSubsidyQty.ToString() + "," + HSubsidyMoney.ToString() +
- ") ";
- oCN.RunProc(sql);
- }
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- /// <summary>
- ///宸ヨ祫缁撶畻鍏朵粬鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Pay_OtherBalBill/DeltetOtherBalBill")]
- [HttpGet]
- public object Pay_OtherBalBill(string HInterID)
- {
- try
- {
- oCN.BeginTran();
- oCN.RunProc("Delete From Pay_OtherBalBillMain where HInterID = " + HInterID);
- oCN.RunProc("Delete From Pay_OtherBalBillSub 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;
- }
- }
- [Route("Pay_OtherBalBill/getOtherBalBillPrice")]
- [HttpGet]
- public object getOtherBalBillPrice(string HMaterID, string HProcID)
- {
- try
- {
- DataSet ds = oCN.RunProcReturn("select 鍗曚环 from h_v_Gy_ProcPriceList where HMaterID='" + HMaterID + "' and HProcID='" + HProcID + "'", "h_v_Gy_ProcPriceList");
- 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/Pay_SingleBalBillController.cs b/WebAPI/Controllers/Pay_SingleBalBillController.cs
deleted file mode 100644
index e9a97f2..0000000
--- a/WebAPI/Controllers/Pay_SingleBalBillController.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers
-{
-
- public class Pay_SingleBalBillController : ApiController
- {
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
- private json objJsonResult = new json();
- public DataSet ds = new DataSet();
- public WebServer webserver = new WebServer();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- //DataSet ds;
-
-
- /// <summary>
- /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Pay_SingleBalBill/GetSingleBalBill")]
- [HttpGet]
- public object GetSingleBalBill(string sWhere)
- {
- try
- {
-
- ds = Sc_GetSingleBalBill(sWhere);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception ex)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- public static DataSet Sc_GetSingleBalBill(string sWhere)
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by 鏃ユ湡 desc", "h_v_Pay_SingleBalBillList");
- }
- else
- {
- string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
- return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
- }
-
- }
-
- #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- [Route("Pay_SingleBalBill/Pay_SingleBalBillListCheckDetail")]
- [HttpGet]
- public ApiResult<DataSet> Pay_SingleBalBillListCheckDetail(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_Pay_SingleBalBillList where hmainid= " + HID + " ", "h_v_Pay_SingleBalBillList");
- 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("Pay_SingleBalBill/Pay_SingleBalBillListProjectDetai")]
- [HttpGet]
- public object Pay_SingleBalBillListProjectDetai(string sqlWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
- ",HGroupID,鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
- ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
- ",HEmpID,HEmpNumber,HEmpName,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 FROM h_v_Pay_SingleBalBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
- 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("Pay_SingleBalBill/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 = "鏂板鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = null;
- 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<Pay_SingleBalBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_SingleBalBill>>(msg2);
- string HBillType = "2205";
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
- string HRemark = mainList[0].HRemark;//澶囨敞
- string HBillSubType = "2205";
- string HMaker = mainList[0].HMaker;
- string HExplanation = "0";
- string HInnerBillNo = "0";
- long HMaterID = mainList[0].HMaterID;//浜у搧ID
- long HGroupID = mainList[0].HGroupID;
- long HDeptID = mainList[0].HDeptID;
- long HProcID = mainList[0].HProcID;
- long HEmpID = mainList[0].HEmpID;
- long HPayType = mainList[0].HPayType;
- //long HMaterTypeID = 0;
- int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
-
- //涓昏〃
- oCN.RunProc(" Insert Into Pay_SingleBalBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker" +
- ",HGroupID,HDeptID,HEmpID,HPayType,HInnerBillNo,HExplanation" + ")" +
- "values('" + HBillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "','" + HDate +
- "','" + HYear + "'," + HPeriod + ",'" + HRemark + "','" + HMaker + "'," + HGroupID + ", " + HDeptID +
- "," + HEmpID + ",'"+ HPayType +"','" + HInnerBillNo + "'," + HExplanation +
- ") ");
-
- //淇濆瓨瀛愯〃
- 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<Pay_SingleBalBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_SingleBalBillSub>>(msg3);
- for (int i = 0; i < subList.ToArray().Length; i++)
- {
- 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;
- decimal HRelationQty = subList[0].HRelationQty;
- decimal HRelationMoney = subList[0].HRelationMoney;
- long HSourceID = subList[0].HSourceID;
- long HSqty = subList[0].HSqty;
- long HSubsidyID = subList[0].HSubsidyID;
- long HDeuctID = subList[0].HDeuctID;
- long HMaterID = subList[0].HMaterID;
- long HProcID = subList[0].HProcID;
- long HEmpID = subList[0].HEmpID;
- decimal HTimes = subList[0].HTimes;
- decimal HQty = subList[0].HQty;
- decimal HPrice = subList[0].HPrice;
- decimal HPackQty = subList[0].HPackQty;
- decimal HPackPrice = subList[0].HPackPrice;
- decimal HPackMoney = subList[0].HPackMoney;
- long HPackMaterID = subList[0].HPackMaterID;
- decimal HPriceRate = subList[0].HPriceRate;
- decimal HSubsidyTotal = subList[0].HSubsidyTotal;
- decimal HDeuctTotal = subList[0].HDeuctTotal;
- decimal HSubsidyQty = subList[0].HSubsidyQty;
- decimal HSubsidyMoney = subList[0].HSubsidyMoney;
- decimal HMoney = subList[0].HMoney;
- long HICMOInterID = subList[0].HICMOInterID;
- string HICMOBillNo = subList[0].HICMOBillNo;
- long HProcReportInterID = subList[0].HProcReportInterID;
- long HProcReportEntryID = subList[0].HProcReportEntryID;
- long HProcPlanInterID = subList[0].HProcPlanInterID;
- long HProcPlanEntryID = subList[0].HProcPlanEntryID;
- string HProcReportBillNo = subList[0].HProcReportBillNo;
- string HProcPlanBillNo = subList[0].HProcPlanBillNo;
-
- string sql = "Insert into Pay_SingleBalBillSub " +
- " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
- ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" +
- ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" +
- ") values("
- + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HCloseMan + "',''," + HCloseType + ",'" + HRemark + "'" +
- "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
- "," + HMaterID.ToString() + "," + HProcID.ToString() + "," + HEmpID.ToString() + "," + HSourceID.ToString()
- + "," + HTimes.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HSqty.ToString() +
- "," +HMoney.ToString() + "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcReportInterID.ToString() + "," + HProcReportEntryID.ToString() + ",'" + HProcReportBillNo + "'" +
- "," +HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'" +
- "," + HPriceRate.ToString() + "," + HSubsidyTotal.ToString() + "," + HDeuctTotal.ToString() + "," + HSubsidyID.ToString() + "," + HDeuctID.ToString() +
- "," + HPackQty.ToString() + "," + HPackPrice.ToString() + "," + HPackMoney.ToString() + "," + HPackMaterID.ToString() + "," + HSubsidyQty.ToString() + "," + HSubsidyMoney.ToString() +
- ") ";
- oCN.RunProc(sql);
- }
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
- }
- /// <summary>
- ///宸ヨ祫缁撶畻涓汉鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Pay_SingleBalBill/DeltetSingleBalBill")]
- [HttpGet]
- public object Pay_SingleBalBill(string HInterID)
- {
- try
- {
- oCN.BeginTran();
- oCN.RunProc("Delete From Pay_SingleBalBillMain where HInterID = " + HInterID);
- oCN.RunProc("Delete From Pay_SingleBalBillSub 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;
- }
- }
-
-
- [Route("Pay_SingleBalBill/getSingleBalBillPrice")]
- [HttpGet]
- public object getSingleBalBillPrice(string HMaterID,string HProcID)
- {
- try
- {
- DataSet ds = oCN.RunProcReturn("select 鍗曚环 from h_v_Gy_ProcPriceList where HMaterID='" + HMaterID + "' and HProcID='" + HProcID + "'", "h_v_Gy_ProcPriceList");
- 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/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 9f9d590..653af57 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -3528,5 +3528,43 @@
#endregion
+
+ #region 鐢ㄦ埛绌挎妗嗘煡璇㈠垪琛�
+ [Route("PublicPageMethod/PeopleTransFerList")]
+ [HttpGet]
+ public object PeopleTransFerList()
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("Select czybm value,czymc title from h_v_Gy_UserList Order by czybm ", "h_v_Gy_UserList");
+ 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
+
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
new file mode 100644
index 0000000..0f1321a
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -0,0 +1,452 @@
+锘縰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.SCGL
+{
+ public class Sc_MESTransFerWorkBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ private WebS.WebService1 oWebs = new WebS.WebService1();
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ public DLL.ClsOA_ErrMsgBackBill BillNew = new DLL.ClsOA_ErrMsgBackBill(); //瀵瑰簲鍗曟嵁绫�
+ public DLL.ClsOA_ErrMsgBackBill BillOld = new DLL.ClsOA_ErrMsgBackBill(); //瀵瑰簲鍗曟嵁绫�
+
+ #region 鎶ュ伐骞冲彴寮傚父鍙嶉鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 寮傚父鍙嶉鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom")]
+ [HttpPost]
+ public object SaveGetMESTransFerWorkFrom([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 UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill();
+ List<Models.ClsOA_ErrMsgBackBillMain> lsmain = new List<Models.ClsOA_ErrMsgBackBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MESTransFerWorkFrom(msg2);
+ foreach (Models.ClsOA_ErrMsgBackBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oItem.HBillType = "3787";
+ oItem.HBillSubType = "3787";
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ string[] arrStr = oItem.HCopyMan.Split(',');
+
+ //鎺ユ敹浜鸿〃浣撴暟鎹�
+ for (int i = 1; i <= arrStr.Length; i++)
+ {
+ Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2();
+ sb.HEntryID = i;
+ sb.HReceiveMan = arrStr[i - 1];
+ oBill.DetailColl2.Add(sb);
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_AutoCheck== "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ }
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鎶ュ伐鍙板紓甯稿弽棣堝崟瀹℃牳銆佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MESTransFerWorkBill/AuditTransFerReportList")]
+ [HttpGet]
+ public object AuditTransFerReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "OA_ErrMsgBackBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 寮傚父鍙嶉鍒楄〃
+
+ [Route("Sc_MESTransFerWorkBill/Get_TransFerBillList")]
+ [HttpGet]
+ public object Get_TransFerBillList(string sWhere, string user)
+ {
+ try
+ {
+ ds = Get_TransFerBillList(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_TransFerBillList(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;
+ var sql = string.Format(@"select A.HInterID,b.HEntryID,A.HBillStatus,A.HBillNo,A.HDate,A.HContext,A.HDescription,A.HRemark,A.HQty,case when A.HSendType=0 then '鍏叡' when B.HReadFlag=1 then '涓汉' end HSendType,
+ A.HDeptID,D.HName HDeptName, A.HSendMan,
+ A.HReceiveMan,B.HReceiveMan HCopyMan,A.HHasten, case when A.HLevel=0 then '鏅��' when B.HReadFlag=1 then '绱ф��' end HLevel,A.HMaterName,A.HMaterModel,
+ case when B.HReadFlag=0 then '鏈槄' when B.HReadFlag=1 then '宸查槄' end HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate,A.HChecker,A.HCheckDate,
+ A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
+ from OA_ErrMsgBackBillMain A
+ inner join OA_ErrMsgBackBillSub2 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_ErrMsgBackBillMain");
+ }
+
+ #endregion
+
+ #region 寮傚父鍙嶉鍒楄〃缂栬緫鑾峰彇鏁版嵁
+ [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Get_TransFerBillListCheckDetai(string HID, string HEntryID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql =string.Format(@"select A.HInterID,b.HEntryID,A.HBillStatus,A.HBillNo,A.HDate,A.HContext,A.HDescription,A.HRemark,
+ A.HQty,A.HSendType,
+ A.HDeptID,D.HName HDeptName, A.HSendMan,
+ A.HReceiveMan,A.HCopyMan,A.HHasten,
+ A.HLevel,A.HMaterName,A.HMaterModel,
+ B.HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate,A.HChecker,A.HCheckDate,A.HCloseMan,A.HCloseDate,A.HDeleteMan,A.HDeleteDate,
+ A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
+ from OA_ErrMsgBackBillMain A
+ inner join OA_ErrMsgBackBillSub2 B on A.HInterID=B.HInterID
+ left join Gy_Department D on A.HDeptID=D.HItemID
+ where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'");
+ var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
+ 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("Sc_MESTransFerWorkBill/Get_UpdateTransFerMessage")]
+ [HttpGet]
+ public object Get_UpdateTransFerMessage(string HInterID, string HEntryID)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Update OA_ErrMsgBackBillSub2 set HReadFlag=1 where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index beff831..a965c20 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -17,7 +17,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
- public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
@@ -320,7 +320,7 @@
if (bResult)
{
string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql);
+ oCN.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
new file mode 100644
index 0000000..e2fd0b2
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
@@ -0,0 +1,369 @@
+锘縰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 Pay_OtherBalBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //DataSet ds;
+ public DLL.ClsPay_OtherBalBill BillNew0 = new DLL.ClsPay_OtherBalBill(); //
+ public DLL.ClsPay_OtherBalBill BillOld0 = new DLL.ClsPay_OtherBalBill(); //
+
+ /// <summary>
+ /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_OtherBalBill/GetOtherBalBill")]
+ [HttpGet]
+ public object GetOtherBalBill(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetOtherBalBill(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetOtherBalBill(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by 鏃ユ湡 desc", "h_v_Pay_OtherBalBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Pay_OtherBalBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
+ }
+
+ }
+
+ #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Pay_OtherBalBillListCheckDetail(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_Pay_OtherBalBillList where hmainid= " + HID + " ", "h_v_Pay_OtherBalBillList");
+ 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("Pay_OtherBalBill/Pay_OtherBalBillListProjectDetai")]
+ [HttpGet]
+ public object Pay_OtherBalBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
+ ",HGroupID,鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
+ ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
+ ",HEmpID,HEmpNumber,HEmpName,宸ユ椂 HTimes ,鏁伴噺 HQty,宸ヤ环 HPrice,閲戦 HMoney ,琛ㄤ綋澶囨敞 as HRemark FROM h_v_Pay_OtherBalBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ [Route("Pay_OtherBalBill/SaveGetOtherBalBillList")]
+ [HttpPost]
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ public object SaveGetOtherBalBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ //string msg4 = sArray[3].ToString();
+
+ string UserName = "";
+ string s = "";
+ long mouldid;
+ ListModels oListModels = new ListModels();
+ try
+ {
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DLL.ClsPay_OtherBalBill oBill = new DLL.ClsPay_OtherBalBill();
+ List<Models.ClsPay_OtherBalBillMain> lsmain = new List<Models.ClsPay_OtherBalBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Pay_OtherBalBillMain(msg2);
+ foreach (Models.ClsPay_OtherBalBillMain 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;
+ }
+ }
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "2206";
+ oItem.HBillSubType = "2206";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Models.ClsPay_OtherBalBillSub> ls = new List<Models.ClsPay_OtherBalBillSub>();
+ ls = oListModels.getObjectByJson_Pay_OtherBalBillSub(msg3);
+ int i = 0;
+ foreach (Models.ClsPay_OtherBalBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ mouldid = oItemSub.HMaterID;
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ ///宸ヨ祫缁撶畻鍏朵粬鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Pay_OtherBalBill/DeltetOtherBalBill")]
+ [HttpGet]
+ public object Pay_OtherBalBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Pay_OtherBalBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Pay_OtherBalBillSub 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;
+ }
+ }
+ [Route("Pay_OtherBalBill/getOtherBalBillPrice")]
+ [HttpGet]
+ public object getOtherBalBillPrice(string HMaterID, string HProcID)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select 鍗曚环 from h_v_Gy_ProcPriceList where HMaterID='" + HMaterID + "' and HProcID='" + HProcID + "'", "h_v_Gy_ProcPriceList");
+ 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/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
new file mode 100644
index 0000000..4a7bfe7
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -0,0 +1,371 @@
+锘縰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 Pay_SingleBalBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ public DLL.ClsPay_SingleBalBill BillNew0 = new DLL.ClsPay_SingleBalBill(); //
+ public DLL.ClsPay_SingleBalBill BillOld0 = new DLL.ClsPay_SingleBalBill(); //
+
+ /// <summary>
+ /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_SingleBalBill/GetSingleBalBill")]
+ [HttpGet]
+ public object GetSingleBalBill(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetSingleBalBill(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetSingleBalBill(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by 鏃ユ湡 desc", "h_v_Pay_SingleBalBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
+ }
+
+ }
+
+ #region[宸ヨ祫缁撶畻涓汉鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Pay_SingleBalBill/Pay_SingleBalBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Pay_SingleBalBillListCheckDetail(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_Pay_SingleBalBillList where hmainid= " + HID + " ", "h_v_Pay_SingleBalBillList");
+ 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("Pay_SingleBalBill/Pay_SingleBalBillListProjectDetai")]
+ [HttpGet]
+ public object Pay_SingleBalBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
+ ",HGroupID,鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
+ ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
+ ",HEmpID,HEmpNumber,HEmpName,宸ユ椂 HTimes ,鏁伴噺 HQty,宸ヤ环 HPrice,閲戦 HMoney ,琛ㄤ綋澶囨敞 as HRemark FROM h_v_Pay_SingleBalBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ [Route("Pay_SingleBalBill/SaveGetSingleBalBillList")]
+ [HttpPost]
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ public object SaveGetSingleBalBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ //string msg4 = sArray[3].ToString();
+
+ string UserName = "";
+ string s = "";
+ long mouldid;
+ ListModels oListModels = new ListModels();
+ try
+ {
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DLL.ClsPay_SingleBalBill oBill = new DLL.ClsPay_SingleBalBill();
+ List<Models.ClsPay_SingleBalBillMain> lsmain = new List<Models.ClsPay_SingleBalBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Pay_SingleBalBillMain(msg2);
+ foreach (Models.ClsPay_SingleBalBillMain 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;
+ }
+ }
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "2205";
+ oItem.HBillSubType = "2205";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Models.ClsPay_SingleBalBillSub> ls = new List<Models.ClsPay_SingleBalBillSub>();
+ ls = oListModels.getObjectByJson_Pay_SingleBalBillSub(msg3);
+ int i = 0;
+ foreach (Models.ClsPay_SingleBalBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ mouldid = oItemSub.HMaterID;
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ ///宸ヨ祫缁撶畻涓汉鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Pay_SingleBalBill/DeltetSingleBalBill")]
+ [HttpGet]
+ public object Pay_SingleBalBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Pay_SingleBalBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Pay_SingleBalBillSub 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;
+ }
+ }
+
+
+ [Route("Pay_SingleBalBill/getSingleBalBillPrice")]
+ [HttpGet]
+ public object getSingleBalBillPrice(string HMaterID,string HProcID)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select 鍗曚环 from h_v_Gy_ProcPriceList where HMaterID='" + HMaterID + "' and HProcID='" + HProcID + "'", "h_v_Gy_ProcPriceList");
+ 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/DLL/ClsOA_ErrMsgBackBill.cs b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
new file mode 100644
index 0000000..f2b911d
--- /dev/null
+++ b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -0,0 +1,311 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsOA_ErrMsgBackBill:DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsOA_ErrMsgBackBillMain omodel = new Models.ClsOA_ErrMsgBackBillMain();
+ public List<Models.ClsOA_ErrMsgBackBillSub> DetailColl = new List<Models.ClsOA_ErrMsgBackBillSub>();
+ public List<Models.ClsOA_ErrMsgBackBillSub2> DetailColl2 = new List<Models.ClsOA_ErrMsgBackBillSub2>();
+
+ public ClsOA_ErrMsgBackBill()
+ {
+ base.MvarItemKeySub = "OA_ErrMsgBackBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="OA_ErrMsgBackBillMain";
+ base.MvarReportTitle = "寮傚父鍙嶉鍗�";
+ base.BillType = "4502";
+ base.HBillSubType = "4502";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsOA_ErrMsgBackBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HContext='" + omodel.HContext + "'" +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HReTransmitMan='" + omodel.HReTransmitMan + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HSendType='" + omodel.HSendType + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HHasten=" + omodel.HHasten.ToString() +
+ ",HQty=" + omodel.HQty.ToString() +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSendStatus,HSendMan,HDescription,HDate"+
+ ") 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.HSendStatus.ToString() + ",'" + oSub.HSendMan + "','" + oSub.HDescription + "','" + oSub.HDate.ToShortDateString() + "'" +
+ ") ");
+ }
+ //
+ foreach (Models.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
+ " (HInterID,HEntryID" +
+ ",HReceiveMan,HReadFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
+ ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+
+ //foreach (Model.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_OA_ErrMsgBackBill_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_ErrMsgBackBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HContext,HDeptID,HDescription,HSendMan,HReceiveMan" +
+ ",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName"+
+ ",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType"+
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ",'" + omodel.HContext + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDescription + "','" + omodel.HSendMan + "','" + omodel.HReceiveMan + "'" +
+ ",'" + omodel.HCopyMan + "'," + omodel.HHasten.ToString() + ",'" + omodel.HLevel + "','" + omodel.HReTransmitMan + "','" + omodel.HBillTypeName + "'" +
+ ",'" + omodel.HPlanBillNo + "','" + omodel.HMaterName + "','" + omodel.HMaterModel + "'," + omodel.HQty.ToString() + ",'" + omodel.HSendType + "'" +
+ ",'" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ //foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
+ //{
+ // oCn.RunProc("Insert into OA_ErrMsgBackBillSub " +
+ // " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ // ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // ",HSendStatus,HSendMan,HDescription,HDate" +
+ // ") 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.HSendStatus.ToString() + ",'" + oSub.HSendMan + "','" + oSub.HDescription + "','" + oSub.HDate.ToShortDateString() + "'" +
+ // ") ");
+ //}
+ //
+ foreach (Models.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
+ " (HInterID,HEntryID" +
+ ",HReceiveMan,HReadFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() +
+ ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+ //foreach (Model.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_OA_ErrMsgBackBill_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 = omodel.HInterID.ToString();
+ 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_ErrMsgBackBillMain Where HInterID=" + lngBillKey.ToString(), "OA_ErrMsgBackBillMain");
+ 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.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HContext = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HContext"]);
+ omodel.HDescription = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDescription"]);
+ omodel.HSendMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSendMan"]);
+ omodel.HReceiveMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReceiveMan"]);
+ omodel.HCopyMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCopyMan"]);
+ omodel.HLevel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLevel"]);
+ omodel.HReTransmitMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReTransmitMan"]);
+ omodel.HBillTypeName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillTypeName"]);
+ omodel.HPlanBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanBillNo"]);
+ omodel.HMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterName"]);
+ omodel.HMaterModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterModel"]);
+ omodel.HSendType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSendType"]);
+ omodel.HHasten = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HHasten"]);
+ omodel.HQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HQty"]);
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from OA_ErrMsgBackBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "OA_ErrMsgBackBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsOA_ErrMsgBackBillSub oSub = new Models.ClsOA_ErrMsgBackBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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.HDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate"]);
+ oSub.HSendStatus = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSendStatus"]);
+ oSub.HSendMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSendMan"]);
+ oSub.HDescription = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDescription"]);
+
+ DetailColl.Add(oSub);
+ }
+ //寰幆瀛愯〃2
+ DataSet DsSubSec = new DataSet();
+ DsSubSec = oCn.RunProcReturn("Select * from OA_ErrMsgBackBillSub2 Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "OA_ErrMsgBackBillSub2");
+ DetailColl2.Clear();//娓呯┖
+ for (int i = 0; i < DsSubSec.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsOA_ErrMsgBackBillSub2 oSubSec = new Models.ClsOA_ErrMsgBackBillSub2();
+ // 鍥哄畾璧嬪��===============================================
+ oSubSec.HInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HInterID"]);
+ oSubSec.HEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HEntryID"]);
+
+ //===================================================
+ oSubSec.HReceiveMan = DBUtility.ClsPub.isStrNull(DsSubSec.Tables[0].Rows[i]["HReceiveMan"]);
+ oSubSec.HReadFlag = DBUtility.ClsPub.isBool(DsSubSec.Tables[0].Rows[i]["HReadFlag"]);
+
+ //
+ DetailColl2.Add(oSubSec);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git "a/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs" "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
new file mode 100644
index 0000000..a1c1f2c
--- /dev/null
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
@@ -0,0 +1,356 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsPay_GroupBalBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsPay_GroupBalBillMain omodel = new Model.ClsPay_GroupBalBillMain();
+ public List<Model.ClsPay_GroupBalBillSub> DetailColl = new List<Model.ClsPay_GroupBalBillSub>();
+ public List<Model.ClsPay_GroupBalBillEmp> DetailEmpColl = new List<Model.ClsPay_GroupBalBillEmp>();
+
+ public ClsPay_GroupBalBill()
+ {
+ base.MvarItemKeySub = "Pay_GroupBalBillSub";
+ base.MvarItemKeySub2 = "Pay_GroupBalBillEmp";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Pay_GroupBalBillMain";
+ base.MvarReportTitle = "宸ヨ祫缁撶畻鍗曪紙鐝粍锛�";
+ base.BillType = "2202";
+ base.HBillSubType = "2202";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsPay_GroupBalBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Pay_GroupBalBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HGroupID=" + omodel.HGroupID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HOtherSubsidy=" + omodel.HOtherSubsidy.ToString() +
+ ",HOtherDeduct=" + omodel.HOtherDeduct.ToString() +
+ ",HSumMoney=" + omodel.HSumMoney.ToString() +
+ ",HPayMoney=" + omodel.HPayMoney.ToString() +
+ ",HPayType=" + omodel.HPayType.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ DeleteBillSub2(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Pay_GroupBalBillSub " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
+ ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ ") ");
+ }
+ //
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
+ {
+ oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HEmpID,HEmpRate" +
+ ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
+ ",HBaseDays,HOverDays,HLeaveDays,HYf" +
+ ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
+ "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
+ "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ }
+ //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_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 Pay_GroupBalBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HGroupID,HDeptID,HPayType,HOtherSubsidy" +
+ ",HOtherDeduct,HSumMoney,HPayMoney" +
+ ",HExplanation,HInnerBillNo" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() +
+ "," + omodel.HOtherDeduct.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() +
+ ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ") ");
+ //
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Pay_GroupBalBillSub " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
+ ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ ") ");
+ }
+ //
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
+ {
+ oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HEmpID,HEmpRate" +
+ ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
+ ",HBaseDays,HOverDays,HLeaveDays,HYf" +
+ ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
+ "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
+ "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ }
+ //
+ //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_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 ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Pay_GroupBalBillMain Where HInterID=" + lngBillKey.ToString(), "Pay_GroupBalBillMain");
+ 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.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HPayType = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPayType"]);
+ omodel.HOtherSubsidy = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HOtherSubsidy"]);
+ omodel.HOtherDeduct = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HOtherDeduct"]);
+ omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
+ omodel.HPayMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPayMoney"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ //
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Pay_GroupBalBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Pay_GroupBalBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsPay_GroupBalBillSub oSub = new Model.ClsPay_GroupBalBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]);
+ oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]);
+ oSub.HTimes = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTimes"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]);
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]);
+ oSub.HProcReportInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcReportInterID"]);
+ oSub.HProcReportEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcReportEntryID"]);
+ oSub.HProcReportBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcReportBillNo"]);
+ oSub.HProcPlanInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanInterID"]);
+ oSub.HProcPlanEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanEntryID"]);
+ oSub.HProcPlanBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcPlanBillNo"]);
+ oSub.HSqty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSqty"]);
+ DetailColl.Add(oSub);
+ }
+ //寰幆瀛愯〃2
+ DataSet DsSubSec = new DataSet();
+ DsSubSec = oCn.RunProcReturn("Select * from Pay_GroupBalBillEmp Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Pay_GroupBalBillMain");
+ DetailEmpColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSubSec.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsPay_GroupBalBillEmp oSubSec = new Model.ClsPay_GroupBalBillEmp();
+ // 鍥哄畾璧嬪��===============================================
+ oSubSec.HInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HInterID"]);
+ oSubSec.HEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HEntryID"]);
+ oSubSec.HSourceInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceInterID"]);
+ oSubSec.HSourceEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSubSec.HSourceBillType = DsSubSec.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSubSec.HSourceBillNo = DsSubSec.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSubSec.HRelationQty = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HRelationQty"]);
+ oSubSec.HRelationMoney = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HRelationMoney"]);
+ oSubSec.HCloseMan = DBUtility.ClsPub.isStrNull(DsSubSec.Tables[0].Rows[i]["HCloseMan"]);
+ oSubSec.HCloseType = DBUtility.ClsPub.isBool(DsSubSec.Tables[0].Rows[i]["HCloseType"]);
+ oSubSec.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSubSec.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSubSec.HRemark = DsSubSec.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSubSec.HEmpID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HEmpID"]);
+ oSubSec.HCTPrjID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HCTPrjID"]);
+ oSubSec.HEmpRate = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HEmpRate"]);
+ oSubSec.HBaseTimes = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HBaseTimes"]);
+ oSubSec.HOverTimes = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HOverTimes"]);
+ oSubSec.HLeaveTimes = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HLeaveTimes"]);
+ oSubSec.HBaseDays = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HBaseDays"]);
+ oSubSec.HOverDays = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HOverDays"]);
+ oSubSec.HLeaveDays = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HLeaveDays"]);
+ oSubSec.HMoney = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HMoney"]);
+ oSubSec.HOtherSubsidy = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HOtherSubsidy"]);
+ oSubSec.HOtherDeduct = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HOtherDeduct"]);
+ oSubSec.HYf = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HYf"]);
+ oSubSec.HIsPay = DBUtility.ClsPub.isBool(DsSubSec.Tables[0].Rows[i]["HIsPay"]);
+ oSubSec.HAvgFlag = DBUtility.ClsPub.isBool(DsSubSec.Tables[0].Rows[i]["HAvgFlag"]);
+
+ //
+ DetailEmpColl.Add(oSubSec);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/WebAPI/DLL/ClsPay_OtherBalBill.cs "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBill.cs"
similarity index 95%
rename from WebAPI/DLL/ClsPay_OtherBalBill.cs
rename to "WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBill.cs"
index be97614..ef24bcd 100644
--- a/WebAPI/DLL/ClsPay_OtherBalBill.cs
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBill.cs"
@@ -3,12 +3,12 @@
using System.Text;
using System.Data;
-namespace DAL
+namespace WebAPI.DLL
{
public class ClsPay_OtherBalBill : DBUtility.ClsXt_BaseBill
{
- public Model.ClsPay_OtherBalBillMain omodel = new Model.ClsPay_OtherBalBillMain();
- public List<Model.ClsPay_OtherBalBillSub> DetailColl = new List<Model.ClsPay_OtherBalBillSub>();
+ public Models.ClsPay_OtherBalBillMain omodel = new Models.ClsPay_OtherBalBillMain();
+ public List<Models.ClsPay_OtherBalBillSub> DetailColl = new List<Models.ClsPay_OtherBalBillSub>();
public ClsPay_OtherBalBill()
{
@@ -61,7 +61,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsPay_OtherBalBillSub oSub in DetailColl)
+ foreach (Models.ClsPay_OtherBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_OtherBalBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -83,7 +83,7 @@
") ");
}
//
- //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
+ //foreach (Models.ClsPay_SingleBalBillSub oSub in DetailColl)
//{
// Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, "");
// if (Ds.Tables[0].Rows.Count == 0)
@@ -117,15 +117,15 @@
//涓昏〃
oCn.RunProc("Insert Into Pay_OtherBalBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HSaveFlag" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsPay_OtherBalBillSub oSub in DetailColl)
+ foreach (Models.ClsPay_OtherBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_OtherBalBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -147,7 +147,7 @@
") ");
}
//
- //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
+ //foreach (Models.ClsPay_SingleBalBillSub oSub in DetailColl)
//{
// Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, "");
// if (Ds.Tables[0].Rows.Count == 0)
@@ -224,7 +224,7 @@
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsPay_OtherBalBillSub oSub = new Model.ClsPay_OtherBalBillSub();
+ Models.ClsPay_OtherBalBillSub oSub = new Models.ClsPay_OtherBalBillSub();
// 鍥哄畾璧嬪��===============================================
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
diff --git a/WebAPI/DLL/ClsPay_SingleBalBill.cs "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
similarity index 97%
rename from WebAPI/DLL/ClsPay_SingleBalBill.cs
rename to "WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
index 11c293c..d48ef6b 100644
--- a/WebAPI/DLL/ClsPay_SingleBalBill.cs
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
@@ -3,12 +3,12 @@
using System.Text;
using System.Data;
-namespace DAL
+namespace WebAPI.DLL
{
public class ClsPay_SingleBalBill : DBUtility.ClsXt_BaseBill
{
- public Model.ClsPay_SingleBalBillMain omodel = new Model.ClsPay_SingleBalBillMain();
- public List<Model.ClsPay_SingleBalBillSub> DetailColl = new List<Model.ClsPay_SingleBalBillSub>();
+ public Models.ClsPay_SingleBalBillMain omodel = new Models.ClsPay_SingleBalBillMain();
+ public List<Models.ClsPay_SingleBalBillSub> DetailColl = new List<Models.ClsPay_SingleBalBillSub>();
public ClsPay_SingleBalBill()
{
@@ -61,7 +61,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
+ foreach (Models.ClsPay_SingleBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_SingleBalBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -125,7 +125,7 @@
", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
+ foreach (Models.ClsPay_SingleBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_SingleBalBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -224,7 +224,7 @@
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsPay_SingleBalBillSub oSub = new Model.ClsPay_SingleBalBillSub();
+ Models.ClsPay_SingleBalBillSub oSub = new Models.ClsPay_SingleBalBillSub();
// 鍥哄畾璧嬪��===============================================
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d8cb399..2db5d75 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1317,31 +1317,7 @@
return list;
}
/// <summary>
- /// 澶勭悊宸ヨ祫涓汉缁撶畻鍗曚富琛ㄧ殑json
- /// </summary>
- /// <param name="jsonString"></param>
- /// <returns></returns>
- public List<Model.ClsPay_SingleBalBillMain> getObjectByJson_Pay_SingleBalBillMain(string jsonString)
- {
- jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsPay_SingleBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillMain>>(jsonString);
- return list;
- }
-
-
- /// <summary>
- /// 澶勭悊宸ヨ祫涓汉缁撶畻鍗曞瓙琛ㄧ殑json
- /// </summary>
- /// <param name="jsonString"></param>
- /// <returns></returns>
- public List<Model.ClsPay_SingleBalBillSub> getObjectByJson_Pay_SingleBalBillSub(string jsonString)
- {
- jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsPay_SingleBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillSub>>(jsonString);
- return list;
- }
- /// <summary>
- /// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曚富琛ㄧ殑json
+ /// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1351,7 +1327,6 @@
List<Model.ClsSc_MouldLifeChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldLifeChangeBillMain>>(jsonString);
return list;
}
-
/// <summary>
/// 澶勭悊鏂板妯″叿瀵垮懡璋冩暣鍗曞瓙琛ㄧ殑json
@@ -1815,5 +1790,58 @@
List<Models.ClsKf_ICStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_ICStockBillSub>>(jsonString);
return list;
}
+
+ //宸ヨ祫绠＄悊 宸ヨ祫缁撶畻鍗�(涓汉)
+ public List<Models.ClsPay_SingleBalBillMain> getObjectByJson_Pay_SingleBalBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_SingleBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_SingleBalBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_SingleBalBillSub> getObjectByJson_Pay_SingleBalBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_SingleBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_SingleBalBillSub>>(jsonString);
+ return list;
+ }
+
+ //宸ヨ祫绠＄悊 宸ヨ祫缁撶畻鍗�(鍏跺畠)
+ public List<Models.ClsPay_OtherBalBillMain> getObjectByJson_Pay_OtherBalBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_OtherBalBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_OtherBalBillMain>>(jsonString);
+ return list;
+ }
+ public List<Models.ClsPay_OtherBalBillSub> getObjectByJson_Pay_OtherBalBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsPay_OtherBalBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsPay_OtherBalBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 寮傚父鍙嶉鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_ErrMsgBackBillMain> getObjectByJson_Gy_MESTransFerWorkFrom(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_ErrMsgBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_ErrMsgBackBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 寮傚父鍙嶉鍗曟帴鏀朵汉瀛愯〃json2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsOA_ErrMsgBackBillSub2> getObjectByJson_Gy_MESTransFerWorkBillSub2(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsOA_ErrMsgBackBillSub2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_ErrMsgBackBillSub2>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
new file mode 100644
index 0000000..1eebf79
--- /dev/null
+++ b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsOA_ErrMsgBackBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public string HContext;// varchar(200) 主题
+ public Int64 HDeptID;// int --发送部门
+ public string HSendMan;// varchar(20) --发送人
+ public string HReceiveMan;// varchar(20) --接收人
+ public string HCopyMan;// varchar(2000) --抄送
+ public Int64 HHasten;// int --催促次数
+ public string HLevel;// varchar(10) --紧急程度（普通，紧急）
+ public string HReTransmitMan;// varchar(1000) --转发至
+
+ public string HDescription;// varchar(5000) --内容
+ public string HBillTypeName;//varchar(20) --单据类型
+ public string HPlanBillNo;// varchar(50) --单据号码
+ public string HMaterName;// varchar(100) --产品名称
+ public string HMaterModel;// varchar(100) --规格型号
+ public double HQty;// money --数量
+ public string HSendType;// varchar(6) --发送类型（公共，个人）
+ }
+}
diff --git a/WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs b/WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs
new file mode 100644
index 0000000..a95ebb9
--- /dev/null
+++ b/WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsOA_ErrMsgBackBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HSendStatus;// int --回复类型（1普通，2审核，4作废，5审核退回，9结案，10验证）
+ public string HSendMan;// varchar(10) --回复人
+ public string HDescription;// varchar(1000) --回复内容
+ public DateTime HDate;// datetime --回复时间
+
+ }
+}
diff --git a/WebAPI/Models/ClsOA_ErrMsgBackBillSub2.cs b/WebAPI/Models/ClsOA_ErrMsgBackBillSub2.cs
new file mode 100644
index 0000000..c412c54
--- /dev/null
+++ b/WebAPI/Models/ClsOA_ErrMsgBackBillSub2.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsOA_ErrMsgBackBillSub2 : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HInterID;// int
+ public Int64 HEntryID;// int
+ public string HReceiveMan;// varchar(10)
+ public bool HReadFlag;// bit
+
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillMain.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillMain.cs"
new file mode 100644
index 0000000..65ac0d9
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillMain.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsPay_OtherBalBillMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HGroupID;// int //班组ID
+ public Int64 HDeptID;// int //
+ public Int64 HEmpID;// int
+ public Int64 HPayType;// int //工资类型
+ public string HExplanation;// varchar(200) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs"
new file mode 100644
index 0000000..e4ee2b5
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_OtherBalBillSub.cs"
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsPay_OtherBalBillSub:DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+ public Int64 HMaterID;// int --物料ID
+ public Int64 HProcID;// int --工序ID
+ public Int64 HEmpID;// int --职员ID
+ public double HTimes;// decimal(18,8) --工时
+ public double HQty;// decimal(18,8) --数量
+ public double HPrice;// decimal(18,8) --工价
+ public double HMoney;// decimal(18,8) --金额
+ public Single HPriceRate;// money -- 定额浮动比率
+ public Single HSubsidyTotal;// money -- 补贴合计
+ public Single HDeuctTotal;// money -- 扣款小计
+ public Int64 HICMOInterID;// int --生产任务单ID
+ public string HICMOBillNo;// varchar(50) --生产任务单号
+ public Int64 HProcReportInterID;// int --工序汇报单ID
+ public Int64 HProcReportEntryID;// int --工序汇报单子ID
+ public string HProcReportBillNo;// varchar(50) --工序汇报单号
+ public Int64 HProcPlanInterID;// int --工序计划单ID
+ public Int64 HProcPlanEntryID;// int --工序计划单子ID
+ public string HProcPlanBillNo;// varchar(50) --工序计划单号
+ public Int64 HSourceID;
+ public long HSubsidyID;// money -- 补贴合计
+ public long HDeuctID;// money -- 扣款小计
+ public double HPackQty;// dec(18,8) --包装数量 --addnew
+ public double HPackPrice;// dec(18,8) --包装单价 --addnew
+ public double HPackMoney;// dec(18,8) --包装金额 --addnew
+ public Int64 HPackMaterID;// int --包装类型 --addnew
+ public double HSubsidyQty;
+ public double HSubsidyMoney;
+ public double HSqty;
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillMain.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillMain.cs"
new file mode 100644
index 0000000..cc236f1
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillMain.cs"
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsPay_SingleBalBillMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HGroupID;// int //班组ID
+ public Int64 HDeptID;// int //
+ public Int64 HEmpID;// int
+ public Int64 HPayType;// int //工资类型
+ public string HExplanation;// varchar(200) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public bool HSaveFlag;
+ }
+}
diff --git "a/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs" "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs"
new file mode 100644
index 0000000..e05a623
--- /dev/null
+++ "b/WebAPI/Models/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs"
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsPay_SingleBalBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+ public Int64 HMaterID;// int --物料ID
+ public Int64 HProcID;// int --工序ID
+ public Int64 HEmpID;// int --职员ID
+ public double HTimes;// decimal(18,8) --工时
+ public double HQty;// decimal(18,8) --数量
+ public double HPrice;// decimal(18,8) --工价
+
+ public Single HPriceRate;// money -- 定额浮动比率
+ public Single HSubsidyTotal;// money -- 补贴合计
+ public Single HDeuctTotal;// money -- 扣款小计
+
+ public double HMoney;// decimal(18,8) --金额
+ public Int64 HICMOInterID;// int --生产任务单ID
+ public string HICMOBillNo;// varchar(50) --生产任务单号
+ public Int64 HProcReportInterID;// int --工序汇报单ID
+ public Int64 HProcReportEntryID;// int --工序汇报单子ID
+ public string HProcReportBillNo;// varchar(50) --工序汇报单号
+ public Int64 HProcPlanInterID;// int --工序计划单ID
+ public Int64 HProcPlanEntryID;// int --工序计划单子ID
+ public string HProcPlanBillNo;// varchar(50) --工序计划单号
+ public Int64 HSourceID;
+ public long HSubsidyID;// money -- 补贴合计
+ public long HDeuctID;// money -- 扣款小计
+ public double HPackQty;// dec(18,8) --包装数量 --addnew
+ public double HPackPrice;// dec(18,8) --包装单价 --addnew
+ public double HPackMoney;// dec(18,8) --包装金额 --addnew
+ public Int64 HPackMaterID;// int --包装类型 --addnew
+ public double HSubsidyQty;
+ public double HSubsidyMoney;
+ public double HSqty;
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index de0ec35..70c44bf 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-11-22T08:27:05.4241947Z;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2021-12-06T09:11:41.4004606Z;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/01/2021 15:39:28</publishTime>
+ <publishTime>12/06/2021 17:11:33</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/01/2021 15:39:28</publishTime>
+ <publishTime>12/06/2021 17:11:33</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/01/2021 15:39:26</publishTime>
+ <publishTime>12/06/2021 17:11:32</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/01/2021 15:39:26</publishTime>
+ <publishTime>12/06/2021 17:11:32</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/01/2021 15:39:22</publishTime>
+ <publishTime>12/06/2021 17:11:31</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/01/2021 15:39:22</publishTime>
+ <publishTime>12/06/2021 17:11:31</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 09:06:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/01/2021 15:39:22</publishTime>
+ <publishTime>12/06/2021 17:11:31</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/01/2021 15:39:22</publishTime>
+ <publishTime>12/06/2021 17:11:31</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:29</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:29</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:30</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:30</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:30</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/01/2021 15:39:21</publishTime>
+ <publishTime>12/06/2021 17:11:30</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/01/2021 15:39:30</publishTime>
+ <publishTime>12/06/2021 17:11:35</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/01/2021 15:39:30</publishTime>
+ <publishTime>12/06/2021 17:11:35</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +204,166 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 19:50:53</publishTime>
+ <publishTime>10/29/2021 17:42:10</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/01/2021 16:07:09</publishTime>
+ <publishTime>12/06/2021 17:11:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index cfc3b1b..6d46f5c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -347,12 +347,12 @@
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
<Compile Include="Controllers\MoveStockBillController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
- <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\PurchaseOrderController.cs" />
<Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
<Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
- <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
@@ -363,6 +363,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipMaintainRuleBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESTransFerWorkBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
@@ -417,6 +418,7 @@
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBill.cs" />
+ <Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" />
<Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
@@ -437,9 +439,10 @@
<Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
- <Compile Include="DLL\ClsPay_SingleBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_SingleBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
- <Compile Include="DLL\ClsPay_OtherBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_OtherBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
@@ -470,8 +473,15 @@
<Compile Include="Models\ClsKf_MateOutBillMain.cs" />
<Compile Include="Models\ClsKf_MateOutBillScheme.cs" />
<Compile Include="Models\ClsKf_MateOutBillSub.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillMain.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillSub.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillSub2.cs" />
<Compile Include="Models\ClsOA_InformBillMain.cs" />
<Compile Include="Models\ClsOA_InformBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillSub.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
<Compile Include="Models\ClsSb_EquipMaintainRuleBillMain.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 729b04f..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -18,7 +18,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.designer.cs"
index 98b8a83..baded1f 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.designer.cs"
@@ -39,10 +39,10 @@
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.bc = new System.Windows.Forms.ToolStripButton();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
this.fq = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.sh = new System.Windows.Forms.ToolStripButton();
@@ -218,7 +218,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1356, 62);
+ this.Tool.Size = new System.Drawing.Size(1526, 74);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -268,7 +268,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 74);
//
// xz
//
@@ -317,7 +317,21 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 74);
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "淇濆瓨";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
//
// AddRow
//
@@ -350,21 +364,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
- //
- // bc
- //
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "淇濆瓨";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.bc.Click += new System.EventHandler(this.bc_Click);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 74);
//
// fq
//
@@ -383,7 +383,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 74);
//
// sh
//
@@ -416,7 +416,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 74);
//
// sz
//
@@ -496,7 +496,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator6.Visible = false;
//
// redblue
@@ -516,7 +516,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator3.Visible = false;
//
// qt
@@ -538,7 +538,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(52, 59);
+ this.qt.Size = new System.Drawing.Size(64, 69);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -547,78 +547,78 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(150, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(197, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(150, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(197, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(150, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(197, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
// 澶嶅埗鍗曟嵁ToolStripMenuItem
//
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Name = "澶嶅埗鍗曟嵁ToolStripMenuItem";
- this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Text = "澶嶅埗鍗曟嵁";
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Click += new System.EventHandler(this.澶嶅埗鍗曟嵁ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 74);
//
// tc
//
@@ -638,13 +638,13 @@
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 74);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 74);
//
// mrlk
//
@@ -654,7 +654,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(86, 69);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -664,7 +664,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 74);
//
// bclk
//
@@ -674,7 +674,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 59);
+ this.bclk.Size = new System.Drawing.Size(86, 69);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -684,7 +684,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 74);
//
// lblCaption
//
@@ -693,7 +693,7 @@
this.lblCaption.Location = new System.Drawing.Point(0, 0);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(1249, 30);
+ this.lblCaption.Size = new System.Drawing.Size(1406, 36);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -721,27 +721,27 @@
this.P1.Controls.Add(this.txtHWWOrderInterID);
this.P1.Controls.Add(this.label5);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Location = new System.Drawing.Point(62, 74);
+ this.P1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1249, 279);
+ this.P1.Size = new System.Drawing.Size(1406, 335);
this.P1.TabIndex = 31;
//
// txtHICMOEntryID
//
- this.txtHICMOEntryID.Location = new System.Drawing.Point(990, -1);
- this.txtHICMOEntryID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOEntryID.Location = new System.Drawing.Point(1114, -1);
+ this.txtHICMOEntryID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHICMOEntryID.Name = "txtHICMOEntryID";
- this.txtHICMOEntryID.Size = new System.Drawing.Size(132, 25);
+ this.txtHICMOEntryID.Size = new System.Drawing.Size(148, 28);
this.txtHICMOEntryID.TabIndex = 310;
this.txtHICMOEntryID.Visible = false;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(417, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Location = new System.Drawing.Point(469, 5);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(88, 38);
+ this.pic1.Size = new System.Drawing.Size(99, 46);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -784,11 +784,11 @@
this.gbUp.Controls.Add(this.txtHBillNo);
this.gbUp.Controls.Add(this.label22);
this.gbUp.Controls.Add(this.txtHInnerBillNo);
- this.gbUp.Location = new System.Drawing.Point(4, 34);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Location = new System.Drawing.Point(4, 41);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1204, 243);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.gbUp.Size = new System.Drawing.Size(1354, 353);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -796,10 +796,10 @@
//
this.label37.AutoSize = true;
this.label37.ForeColor = System.Drawing.Color.Black;
- this.label37.Location = new System.Drawing.Point(802, 68);
+ this.label37.Location = new System.Drawing.Point(902, 82);
this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(82, 15);
+ this.label37.Size = new System.Drawing.Size(98, 18);
this.label37.TabIndex = 312;
this.label37.Text = "璁㈠崟璺熻釜鍙�";
//
@@ -808,21 +808,21 @@
this.txtHOrderProcNO.BackColor = System.Drawing.Color.Beige;
this.txtHOrderProcNO.Enabled = false;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(906, 66);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(1019, 79);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(249, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(280, 28);
this.txtHOrderProcNO.TabIndex = 313;
//
// label31
//
this.label31.AutoSize = true;
this.label31.ForeColor = System.Drawing.Color.Black;
- this.label31.Location = new System.Drawing.Point(808, 111);
+ this.label31.Location = new System.Drawing.Point(909, 133);
this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(67, 15);
+ this.label31.Size = new System.Drawing.Size(80, 18);
this.label31.TabIndex = 302;
this.label31.Text = "瑙勬牸鍨嬪彿";
//
@@ -830,10 +830,10 @@
//
this.txtHModel.BackColor = System.Drawing.SystemColors.Window;
this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel.Location = new System.Drawing.Point(907, 106);
- this.txtHModel.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHModel.Location = new System.Drawing.Point(1020, 127);
+ this.txtHModel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHModel.Name = "txtHModel";
- this.txtHModel.Size = new System.Drawing.Size(249, 25);
+ this.txtHModel.Size = new System.Drawing.Size(280, 28);
this.txtHModel.TabIndex = 303;
this.txtHModel.Tag = "0";
//
@@ -841,10 +841,10 @@
//
this.label33.AutoSize = true;
this.label33.ForeColor = System.Drawing.Color.Black;
- this.label33.Location = new System.Drawing.Point(433, 72);
+ this.label33.Location = new System.Drawing.Point(487, 86);
this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(82, 15);
+ this.label33.Size = new System.Drawing.Size(98, 18);
this.label33.TabIndex = 300;
this.label33.Text = "娴佽浆鍗℃暟閲�";
//
@@ -852,10 +852,10 @@
//
this.txtHQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(532, 67);
- this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHQty.Location = new System.Drawing.Point(598, 80);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(249, 25);
+ this.txtHQty.Size = new System.Drawing.Size(280, 28);
this.txtHQty.TabIndex = 301;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -864,20 +864,20 @@
//
this.dtpHPlanEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanEndDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanEndDate.Location = new System.Drawing.Point(531, 140);
- this.dtpHPlanEndDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHPlanEndDate.Location = new System.Drawing.Point(597, 168);
+ this.dtpHPlanEndDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHPlanEndDate.Name = "dtpHPlanEndDate";
- this.dtpHPlanEndDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHPlanEndDate.Size = new System.Drawing.Size(280, 28);
this.dtpHPlanEndDate.TabIndex = 282;
//
// label12
//
this.label12.AutoSize = true;
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(413, 145);
+ this.label12.Location = new System.Drawing.Point(465, 174);
this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(97, 15);
+ this.label12.Size = new System.Drawing.Size(116, 18);
this.label12.TabIndex = 281;
this.label12.Text = "璁″垝瀹屽伐鏃ユ湡";
//
@@ -885,20 +885,20 @@
//
this.dtpHPlanBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanBeginDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanBeginDate.Location = new System.Drawing.Point(136, 140);
- this.dtpHPlanBeginDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHPlanBeginDate.Location = new System.Drawing.Point(153, 168);
+ this.dtpHPlanBeginDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHPlanBeginDate.Name = "dtpHPlanBeginDate";
- this.dtpHPlanBeginDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHPlanBeginDate.Size = new System.Drawing.Size(280, 28);
this.dtpHPlanBeginDate.TabIndex = 280;
//
// label7
//
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(28, 145);
+ this.label7.Location = new System.Drawing.Point(32, 174);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(97, 15);
+ this.label7.Size = new System.Drawing.Size(116, 18);
this.label7.TabIndex = 279;
this.label7.Text = "璁″垝寮�宸ユ棩鏈�";
//
@@ -906,10 +906,10 @@
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(807, 8);
+ this.label28.Location = new System.Drawing.Point(908, 10);
this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(67, 15);
+ this.label28.Size = new System.Drawing.Size(80, 18);
this.label28.TabIndex = 277;
this.label28.Text = "鐢熶骇鏁伴噺";
this.label28.Visible = false;
@@ -918,10 +918,10 @@
//
this.txtHPlanQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(906, 3);
- this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPlanQty.Location = new System.Drawing.Point(1019, 4);
+ this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHPlanQty.Name = "txtHPlanQty";
- this.txtHPlanQty.Size = new System.Drawing.Size(249, 25);
+ this.txtHPlanQty.Size = new System.Drawing.Size(280, 28);
this.txtHPlanQty.TabIndex = 278;
this.txtHPlanQty.Tag = "0";
this.txtHPlanQty.Visible = false;
@@ -931,10 +931,10 @@
this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHUnitID.Location = new System.Drawing.Point(1128, 139);
- this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHUnitID.Location = new System.Drawing.Point(1269, 167);
+ this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdHUnitID.Name = "cmdHUnitID";
- this.cmdHUnitID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHUnitID.Size = new System.Drawing.Size(33, 34);
this.cmdHUnitID.TabIndex = 274;
this.cmdHUnitID.UseVisualStyleBackColor = false;
this.cmdHUnitID.Click += new System.EventHandler(this.cmdHUnitID_Click);
@@ -943,10 +943,10 @@
//
this.label26.AutoSize = true;
this.label26.ForeColor = System.Drawing.Color.Black;
- this.label26.Location = new System.Drawing.Point(808, 145);
+ this.label26.Location = new System.Drawing.Point(909, 174);
this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(69, 15);
+ this.label26.Size = new System.Drawing.Size(80, 18);
this.label26.TabIndex = 272;
this.label26.Text = "鍗� 浣�";
//
@@ -954,10 +954,10 @@
//
this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitID.Location = new System.Drawing.Point(907, 140);
- this.txtHUnitID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHUnitID.Location = new System.Drawing.Point(1020, 168);
+ this.txtHUnitID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHUnitID.Name = "txtHUnitID";
- this.txtHUnitID.Size = new System.Drawing.Size(220, 25);
+ this.txtHUnitID.Size = new System.Drawing.Size(247, 28);
this.txtHUnitID.TabIndex = 273;
this.txtHUnitID.Tag = "0";
this.txtHUnitID.TextChanged += new System.EventHandler(this.txtHUnitID_TextChanged);
@@ -966,10 +966,10 @@
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(432, 109);
+ this.label10.Location = new System.Drawing.Point(486, 131);
this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.Size = new System.Drawing.Size(80, 18);
this.label10.TabIndex = 270;
this.label10.Text = "浜у搧浠ｇ爜";
//
@@ -977,10 +977,10 @@
//
this.txtHMaterNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber.Location = new System.Drawing.Point(531, 104);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(597, 125);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(280, 28);
this.txtHMaterNumber.TabIndex = 271;
this.txtHMaterNumber.Tag = "0";
//
@@ -989,10 +989,10 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterID.Location = new System.Drawing.Point(360, 101);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHMaterID.Location = new System.Drawing.Point(405, 121);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHMaterID.Size = new System.Drawing.Size(33, 34);
this.cmdHMaterID.TabIndex = 269;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
@@ -1001,10 +1001,10 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(45, 106);
+ this.label14.Location = new System.Drawing.Point(51, 127);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(69, 15);
+ this.label14.Size = new System.Drawing.Size(80, 18);
this.label14.TabIndex = 267;
this.label14.Text = "浜� 鍝�";
//
@@ -1012,10 +1012,10 @@
//
this.txtHMaterID.BackColor = System.Drawing.Color.Beige;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(137, 102);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(154, 122);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(220, 25);
+ this.txtHMaterID.Size = new System.Drawing.Size(247, 28);
this.txtHMaterID.TabIndex = 268;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -1024,10 +1024,10 @@
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(44, 69);
+ this.label1.Location = new System.Drawing.Point(50, 83);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(98, 18);
this.label1.TabIndex = 265;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -1035,41 +1035,41 @@
//
this.txtHICMOBillNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(136, 64);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(153, 77);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
- this.txtHICMOBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(280, 28);
this.txtHICMOBillNo.TabIndex = 266;
this.txtHICMOBillNo.Tag = "0";
//
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(137, 175);
- this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHRemark.Location = new System.Drawing.Point(154, 210);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(1028, 55);
+ this.txtHRemark.Size = new System.Drawing.Size(1156, 65);
this.txtHRemark.TabIndex = 264;
//
// label20
//
this.label20.AutoSize = true;
this.label20.ForeColor = System.Drawing.Color.Black;
- this.label20.Location = new System.Drawing.Point(45, 178);
+ this.label20.Location = new System.Drawing.Point(51, 214);
this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(69, 15);
+ this.label20.Size = new System.Drawing.Size(80, 18);
this.label20.TabIndex = 263;
this.label20.Text = "澶� 娉�";
//
// txtHWWOrderBillNo
//
this.txtHWWOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderBillNo.Location = new System.Drawing.Point(887, -17);
- this.txtHWWOrderBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWWOrderBillNo.Location = new System.Drawing.Point(998, -20);
+ this.txtHWWOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHWWOrderBillNo.Name = "txtHWWOrderBillNo";
- this.txtHWWOrderBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderBillNo.Size = new System.Drawing.Size(280, 28);
this.txtHWWOrderBillNo.TabIndex = 262;
this.txtHWWOrderBillNo.Tag = "0";
this.txtHWWOrderBillNo.Visible = false;
@@ -1078,10 +1078,10 @@
//
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(788, -12);
+ this.label2.Location = new System.Drawing.Point(886, -14);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(98, 18);
this.label2.TabIndex = 261;
this.label2.Text = "濮斿璁㈠崟鍙�";
this.label2.Visible = false;
@@ -1089,10 +1089,10 @@
// txtHWWOrderEntryID
//
this.txtHWWOrderEntryID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderEntryID.Location = new System.Drawing.Point(936, -17);
- this.txtHWWOrderEntryID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWWOrderEntryID.Location = new System.Drawing.Point(1053, -20);
+ this.txtHWWOrderEntryID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHWWOrderEntryID.Name = "txtHWWOrderEntryID";
- this.txtHWWOrderEntryID.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderEntryID.Size = new System.Drawing.Size(280, 28);
this.txtHWWOrderEntryID.TabIndex = 258;
this.txtHWWOrderEntryID.Tag = "0";
this.txtHWWOrderEntryID.Visible = false;
@@ -1101,10 +1101,10 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(811, -12);
+ this.label16.Location = new System.Drawing.Point(912, -14);
this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(112, 15);
+ this.label16.Size = new System.Drawing.Size(134, 18);
this.label16.TabIndex = 257;
this.label16.Text = "濮斿璁㈠崟瀛愬唴鐮�";
this.label16.Visible = false;
@@ -1113,20 +1113,20 @@
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHDate.Location = new System.Drawing.Point(532, 29);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHDate.Location = new System.Drawing.Point(598, 35);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHDate.Size = new System.Drawing.Size(274, 28);
this.dtpHDate.TabIndex = 256;
//
// label9
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(431, 34);
+ this.label9.Location = new System.Drawing.Point(485, 41);
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(69, 15);
+ this.label9.Size = new System.Drawing.Size(80, 18);
this.label9.TabIndex = 255;
this.label9.Text = "鏃� 鏈�";
//
@@ -1134,10 +1134,10 @@
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(45, 34);
+ this.label4.Location = new System.Drawing.Point(51, 41);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(68, 15);
+ this.label4.Size = new System.Drawing.Size(80, 18);
this.label4.TabIndex = 251;
this.label4.Text = "鍗� 鎹� 鍙�";
//
@@ -1145,30 +1145,30 @@
//
this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(137, 29);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(154, 35);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(280, 28);
this.txtHBillNo.TabIndex = 252;
//
// label22
//
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.Color.Black;
- this.label22.Location = new System.Drawing.Point(808, 34);
+ this.label22.Location = new System.Drawing.Point(909, 41);
this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(82, 15);
+ this.label22.Size = new System.Drawing.Size(98, 18);
this.label22.TabIndex = 253;
this.label22.Text = "鍐呴儴鍗曟嵁鍙�";
//
// txtHInnerBillNo
//
this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(907, 29);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(1020, 35);
+ this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(280, 28);
this.txtHInnerBillNo.TabIndex = 254;
this.txtHInnerBillNo.Tag = "0";
//
@@ -1176,10 +1176,10 @@
//
this.label18.AutoSize = true;
this.label18.ForeColor = System.Drawing.Color.Black;
- this.label18.Location = new System.Drawing.Point(789, 12);
+ this.label18.Location = new System.Drawing.Point(888, 14);
this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(69, 15);
+ this.label18.Size = new System.Drawing.Size(80, 18);
this.label18.TabIndex = 94;
this.label18.Text = "鎽� 瑕�";
this.label18.Visible = false;
@@ -1188,10 +1188,10 @@
//
this.label32.AutoSize = true;
this.label32.ForeColor = System.Drawing.Color.Black;
- this.label32.Location = new System.Drawing.Point(819, 15);
+ this.label32.Location = new System.Drawing.Point(921, 18);
this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(69, 15);
+ this.label32.Size = new System.Drawing.Size(80, 18);
this.label32.TabIndex = 283;
this.label32.Text = "鎽� 瑕�";
this.label32.Visible = false;
@@ -1201,10 +1201,10 @@
this.cmdHSupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSupID.Image")));
this.cmdHSupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSupID.Location = new System.Drawing.Point(1112, 7);
- this.cmdHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHSupID.Location = new System.Drawing.Point(1251, 8);
+ this.cmdHSupID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdHSupID.Name = "cmdHSupID";
- this.cmdHSupID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHSupID.Size = new System.Drawing.Size(33, 34);
this.cmdHSupID.TabIndex = 287;
this.cmdHSupID.UseVisualStyleBackColor = false;
this.cmdHSupID.Visible = false;
@@ -1214,10 +1214,10 @@
//
this.txtHExplanation.BackColor = System.Drawing.SystemColors.Window;
this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHExplanation.Location = new System.Drawing.Point(911, 11);
- this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHExplanation.Location = new System.Drawing.Point(1025, 13);
+ this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHExplanation.Name = "txtHExplanation";
- this.txtHExplanation.Size = new System.Drawing.Size(248, 25);
+ this.txtHExplanation.Size = new System.Drawing.Size(278, 28);
this.txtHExplanation.TabIndex = 284;
this.txtHExplanation.Tag = "0";
this.txtHExplanation.Visible = false;
@@ -1227,10 +1227,10 @@
this.cmdHWorkShopID.BackColor = System.Drawing.Color.Transparent;
this.cmdHWorkShopID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWorkShopID.Image")));
this.cmdHWorkShopID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWorkShopID.Location = new System.Drawing.Point(1082, 7);
- this.cmdHWorkShopID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHWorkShopID.Location = new System.Drawing.Point(1217, 8);
+ this.cmdHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdHWorkShopID.Name = "cmdHWorkShopID";
- this.cmdHWorkShopID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHWorkShopID.Size = new System.Drawing.Size(33, 34);
this.cmdHWorkShopID.TabIndex = 290;
this.cmdHWorkShopID.UseVisualStyleBackColor = false;
this.cmdHWorkShopID.Visible = false;
@@ -1240,10 +1240,10 @@
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(783, 14);
+ this.label3.Location = new System.Drawing.Point(881, 17);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(116, 18);
this.label3.TabIndex = 285;
this.label3.Text = "濮斿鍔犲伐鍗曚綅";
this.label3.Visible = false;
@@ -1252,10 +1252,10 @@
//
this.label30.AutoSize = true;
this.label30.ForeColor = System.Drawing.Color.Black;
- this.label30.Location = new System.Drawing.Point(783, 22);
+ this.label30.Location = new System.Drawing.Point(881, 26);
this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(69, 15);
+ this.label30.Size = new System.Drawing.Size(80, 18);
this.label30.TabIndex = 296;
this.label30.Text = "鎵� 鍙�";
this.label30.Visible = false;
@@ -1263,10 +1263,10 @@
// txtHSupID
//
this.txtHSupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupID.Location = new System.Drawing.Point(891, 9);
- this.txtHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSupID.Location = new System.Drawing.Point(1002, 11);
+ this.txtHSupID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(220, 25);
+ this.txtHSupID.Size = new System.Drawing.Size(247, 28);
this.txtHSupID.TabIndex = 286;
this.txtHSupID.Tag = "0";
this.txtHSupID.Visible = false;
@@ -1276,10 +1276,10 @@
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(758, 14);
+ this.label6.Location = new System.Drawing.Point(853, 17);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.Size = new System.Drawing.Size(80, 18);
this.label6.TabIndex = 288;
this.label6.Text = "鐢熶骇杞﹂棿";
this.label6.Visible = false;
@@ -1288,10 +1288,10 @@
//
this.txtHUnitNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHUnitNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitNumber.Location = new System.Drawing.Point(847, 4);
- this.txtHUnitNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHUnitNumber.Location = new System.Drawing.Point(953, 5);
+ this.txtHUnitNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHUnitNumber.Name = "txtHUnitNumber";
- this.txtHUnitNumber.Size = new System.Drawing.Size(249, 25);
+ this.txtHUnitNumber.Size = new System.Drawing.Size(280, 28);
this.txtHUnitNumber.TabIndex = 276;
this.txtHUnitNumber.Tag = "0";
this.txtHUnitNumber.Visible = false;
@@ -1299,10 +1299,10 @@
// txtHWorkShopID
//
this.txtHWorkShopID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkShopID.Location = new System.Drawing.Point(860, 9);
- this.txtHWorkShopID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWorkShopID.Location = new System.Drawing.Point(968, 11);
+ this.txtHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHWorkShopID.Name = "txtHWorkShopID";
- this.txtHWorkShopID.Size = new System.Drawing.Size(220, 25);
+ this.txtHWorkShopID.Size = new System.Drawing.Size(247, 28);
this.txtHWorkShopID.TabIndex = 289;
this.txtHWorkShopID.Tag = "0";
this.txtHWorkShopID.Visible = false;
@@ -1312,10 +1312,10 @@
//
this.txtHBatchNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBatchNo.Location = new System.Drawing.Point(882, 17);
- this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBatchNo.Location = new System.Drawing.Point(992, 20);
+ this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHBatchNo.Name = "txtHBatchNo";
- this.txtHBatchNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBatchNo.Size = new System.Drawing.Size(280, 28);
this.txtHBatchNo.TabIndex = 297;
this.txtHBatchNo.Tag = "0";
this.txtHBatchNo.Visible = false;
@@ -1324,10 +1324,10 @@
//
this.label24.AutoSize = true;
this.label24.ForeColor = System.Drawing.Color.Black;
- this.label24.Location = new System.Drawing.Point(745, 9);
+ this.label24.Location = new System.Drawing.Point(838, 11);
this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(67, 15);
+ this.label24.Size = new System.Drawing.Size(80, 18);
this.label24.TabIndex = 275;
this.label24.Text = "鍗曚綅浠ｇ爜";
this.label24.Visible = false;
@@ -1335,10 +1335,10 @@
// txtHWWOrderInterID
//
this.txtHWWOrderInterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderInterID.Location = new System.Drawing.Point(919, 4);
- this.txtHWWOrderInterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWWOrderInterID.Location = new System.Drawing.Point(1034, 5);
+ this.txtHWWOrderInterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHWWOrderInterID.Name = "txtHWWOrderInterID";
- this.txtHWWOrderInterID.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderInterID.Size = new System.Drawing.Size(280, 28);
this.txtHWWOrderInterID.TabIndex = 260;
this.txtHWWOrderInterID.Tag = "0";
this.txtHWWOrderInterID.Visible = false;
@@ -1347,10 +1347,10 @@
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(811, 9);
+ this.label5.Location = new System.Drawing.Point(912, 11);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(116, 18);
this.label5.TabIndex = 259;
this.label5.Text = "濮斿璁㈠崟鍐呯爜";
this.label5.Visible = false;
@@ -1379,20 +1379,20 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(55, 837);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.panel2.Location = new System.Drawing.Point(62, 1005);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1249, 91);
+ this.panel2.Size = new System.Drawing.Size(1406, 109);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(1088, 71);
this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(147, 23);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -1400,10 +1400,10 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(888, 62);
+ this.label25.Location = new System.Drawing.Point(999, 74);
this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(67, 15);
+ this.label25.Size = new System.Drawing.Size(80, 18);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -1411,10 +1411,10 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(1088, 18);
this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(147, 23);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -1422,10 +1422,10 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(888, 15);
+ this.label27.Location = new System.Drawing.Point(999, 18);
this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(52, 15);
+ this.label27.Size = new System.Drawing.Size(62, 18);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -1433,10 +1433,10 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(843, 71);
this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(147, 23);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -1444,10 +1444,10 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(671, 59);
+ this.label23.Location = new System.Drawing.Point(755, 71);
this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.Size = new System.Drawing.Size(80, 18);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -1455,10 +1455,10 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
+ this.txtHUpDater.Location = new System.Drawing.Point(843, 18);
this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDater.Size = new System.Drawing.Size(147, 23);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -1466,10 +1466,10 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(671, 15);
+ this.label21.Location = new System.Drawing.Point(755, 18);
this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(52, 15);
+ this.label21.Size = new System.Drawing.Size(62, 18);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -1477,10 +1477,10 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
+ this.txtHCloseDate.Location = new System.Drawing.Point(595, 71);
this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseDate.Size = new System.Drawing.Size(147, 23);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -1488,10 +1488,10 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(451, 62);
+ this.label19.Location = new System.Drawing.Point(507, 74);
this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.Size = new System.Drawing.Size(80, 18);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -1499,10 +1499,10 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
+ this.txtHCloseMan.Location = new System.Drawing.Point(594, 19);
this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseMan.Size = new System.Drawing.Size(147, 23);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -1510,10 +1510,10 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(451, 20);
+ this.label17.Location = new System.Drawing.Point(507, 24);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.Size = new System.Drawing.Size(62, 18);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -1521,10 +1521,10 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
+ this.txtHCheckDate.Location = new System.Drawing.Point(351, 71);
this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCheckDate.Size = new System.Drawing.Size(147, 23);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -1532,10 +1532,10 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(233, 62);
+ this.label15.Location = new System.Drawing.Point(262, 74);
this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.Size = new System.Drawing.Size(80, 18);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -1543,10 +1543,10 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(312, 16);
+ this.txtHChecker.Location = new System.Drawing.Point(351, 19);
this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(131, 19);
+ this.txtHChecker.Size = new System.Drawing.Size(147, 23);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -1554,10 +1554,10 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(233, 20);
+ this.label13.Location = new System.Drawing.Point(262, 24);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.Size = new System.Drawing.Size(62, 18);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -1565,10 +1565,10 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
+ this.txtHMakeDate.Location = new System.Drawing.Point(107, 71);
this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHMakeDate.Size = new System.Drawing.Size(147, 23);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -1576,10 +1576,10 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(16, 62);
+ this.label11.Location = new System.Drawing.Point(18, 74);
this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(67, 15);
+ this.label11.Size = new System.Drawing.Size(80, 18);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -1587,10 +1587,10 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(95, 16);
+ this.txtHMaker.Location = new System.Drawing.Point(107, 19);
this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(131, 19);
+ this.txtHMaker.Size = new System.Drawing.Size(147, 23);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -1598,10 +1598,10 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(16, 20);
+ this.label8.Location = new System.Drawing.Point(18, 24);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.Size = new System.Drawing.Size(62, 18);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -1613,29 +1613,30 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(0, 74);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(55, 866);
+ this.panel1.Size = new System.Drawing.Size(62, 1040);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Location = new System.Drawing.Point(1468, 74);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(52, 866);
+ this.panel3.Size = new System.Drawing.Size(58, 1040);
this.panel3.TabIndex = 34;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(1214, 815);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 62;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(37, 36);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -1643,11 +1644,11 @@
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(55, 341);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Location = new System.Drawing.Point(62, 409);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1249, 496);
+ this.tabControl1.Size = new System.Drawing.Size(1406, 596);
this.tabControl1.TabIndex = 55;
//
// tabPage1
@@ -1655,11 +1656,11 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Controls.Add(this.grdSum);
this.tabPage1.Controls.Add(this.panel6);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 28);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1241, 467);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage1.Size = new System.Drawing.Size(1398, 564);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏄庣粏淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1673,23 +1674,23 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(4, 5);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1233, 405);
+ this.grdMain.Size = new System.Drawing.Size(1390, 490);
this.grdMain.TabIndex = 58;
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
- this.grdMain.MouseUp += new System.Windows.Forms.MouseEventHandler(this.grdMain_MouseUp);
- this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
- this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
- this.grdMain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.grdMain_KeyDown);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ this.grdMain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.grdMain_KeyDown);
+ this.grdMain.MouseUp += new System.Windows.Forms.MouseEventHandler(this.grdMain_MouseUp);
//
// grdSum
//
@@ -1698,13 +1699,14 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(4, 409);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(4, 495);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1233, 24);
+ this.grdSum.Size = new System.Drawing.Size(1390, 29);
this.grdSum.TabIndex = 57;
//
// panel6
@@ -1713,27 +1715,27 @@
this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel6.Controls.Add(this.lblHStockQty);
this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel6.Location = new System.Drawing.Point(4, 433);
- this.panel6.Margin = new System.Windows.Forms.Padding(4);
+ this.panel6.Location = new System.Drawing.Point(4, 524);
+ this.panel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1233, 30);
+ this.panel6.Size = new System.Drawing.Size(1390, 35);
this.panel6.TabIndex = 56;
//
// lblHStockQty
//
this.lblHStockQty.AutoSize = true;
- this.lblHStockQty.Location = new System.Drawing.Point(11, 8);
+ this.lblHStockQty.Location = new System.Drawing.Point(12, 10);
this.lblHStockQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblHStockQty.Name = "lblHStockQty";
- this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
+ this.lblHStockQty.Size = new System.Drawing.Size(0, 18);
this.lblHStockQty.TabIndex = 0;
//
// Sc_ProcessExchangeBackBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1356, 928);
+ this.ClientSize = new System.Drawing.Size(1526, 1114);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -1743,13 +1745,13 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "Sc_ProcessExchangeBackBill";
this.Text = "杩斿伐宸ュ簭娴佽浆鍗＄紪杈�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Sc_ProcessExchangeBackBill_FormClosing);
this.Load += new System.EventHandler(this.Sc_ProcessExchangeBackBill_Load);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.Sc_ProcessExchangeBackBill_Paint);
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Sc_ProcessExchangeBackBill_FormClosing);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.P1.ResumeLayout(false);
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.resx"
index 65e5f6e..0b0f5c6 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBackBill.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -360,7 +360,7 @@
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
@@ -370,7 +370,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -380,7 +380,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -393,7 +393,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -407,7 +407,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -422,7 +422,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -436,7 +436,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -451,7 +451,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -462,7 +462,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -472,7 +472,7 @@
<data name="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -481,7 +481,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -494,7 +494,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -507,7 +507,7 @@
<data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
@@ -516,7 +516,7 @@
<data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
@@ -525,7 +525,7 @@
<data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -534,7 +534,7 @@
<data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
cBFxK5ZNAAAAAElFTkSuQmCC
@@ -543,7 +543,7 @@
<data name="tm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -556,7 +556,7 @@
<data name="redblue.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -567,7 +567,7 @@
<data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
@@ -577,7 +577,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -587,7 +587,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -602,7 +602,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -674,10 +674,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>93, 17</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.1