From 24d75428cb7269c89ddb97c2a9573df6e597aaef Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 29 九月 2021 17:36:14 +0800
Subject: [PATCH] 增加工种模块+增加工资类型模块
---
DAL/质检管理/ClsQC_NoPassProdCheckBill.cs | 52 +-
WorkM/流转卡管理/MES_StationEntrustInBill.designer.cs | 400 ++++++++----------
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 194 ++++----
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 6
WorkM/流转卡管理/MES_StationEntrustInBill.cs | 23 +
WorkM/流转卡管理/MES_StationEntrustOutBill.designer.cs | 475 +++++++++------------
WebAPI/WebAPI.csproj.user | 2
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 1
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs | 62 ++
WebAPI/WebAPI.csproj | 1
WorkM/流转卡管理/MES_StationEntrustOutBill.cs | 25 +
11 files changed, 619 insertions(+), 622 deletions(-)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
index 8a00be1..eb8d2e8 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
@@ -172,19 +172,19 @@
//鏍规嵁鍐呯爜 鍥炲～瀵瑰簲娴佽浆鍗� 涓嶈壇鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
//////////////////////////////
- //DataSet Ds;
- //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
- //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- //{
- // oCn.RollBack();
- // return false;
- //}
- //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- //{
- // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- // oCn.RollBack();
- // return false;
- //}
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
////////////////////////
@@ -275,19 +275,19 @@
oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
//
//////////////////////////////
- //DataSet Ds;
- //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
- //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- //{
- // oCn.RollBack();
- // return false;
- //}
- //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- //{
- // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- // oCn.RollBack();
- // return false;
- //}
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
////////////////////////
//
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 03dae82..8699de8 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -651,7 +651,11 @@
{
omodel.QC_NoPassProdCheckBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ //不良品评审单不良数量和不良原因总数必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_BadReasonQtyCtrl")
+ {
+ omodel.QC_NoPassProdCheckBill_BadReasonQtyCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=======委外发出
//工站或工序先进先出（同上）
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index c3adadf..def4b5d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -178,6 +178,7 @@
public string MES_StationOutBill_FirstCheckOut; //出战单判断本道工序是否做首件检验
//不良品评审单
public string QC_NoPassProdCheckBill_QtyCtl; //不良品数不能大于出站单报废数量
+ public string QC_NoPassProdCheckBill_BadReasonQtyCtrl; //不良品评审单不良数量和不良原因总数必须一致
//委外发出
public string MES_StationEntrustInBill_FIFOCtl; //工站或工序先进先出（同上）
public string MES_StationEntrustInBill_FullMoveCtl; //上道完全出站控制（同上）
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
new file mode 100644
index 0000000..5a56f56
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
@@ -0,0 +1,62 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ //鐝粍Controller
+ public class Gy_ProcPriceController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鐝粍鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ #region 杩斿洖宸ュ簭宸ヤ环鍒楄〃
+ [Route("Gy_ProcPrice/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index ec9a764..b81d788 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,44 +5,44 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-09-27T08:17:35.7180978Z;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-09-29T07:48:55.1547397Z;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/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/29/2021 17:04:09</publishTime>
+ <publishTime>09/29/2021 15:48:49</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/29/2021 17:04:09</publishTime>
+ <publishTime>09/29/2021 15:48:49</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/29/2021 17:04:07</publishTime>
+ <publishTime>09/29/2021 15:48:47</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/29/2021 17:04:07</publishTime>
+ <publishTime>09/29/2021 15:48:47</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/29/2021 17:04:03</publishTime>
+ <publishTime>09/29/2021 15:48:46</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/29/2021 17:04:03</publishTime>
+ <publishTime>09/29/2021 15:48:46</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/25/2021 20:46:09</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
+ <publishTime>03/19/2015 01:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 11:48:56</publishTime>
+ <publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/29/2021 17:04:04</publishTime>
+ <publishTime>09/29/2021 15:48:46</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/29/2021 17:04:04</publishTime>
+ <publishTime>09/29/2021 15:48:46</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/03/2014 20:33:56</publishTime>
+ <publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/29/2021 17:04:01</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/29/2021 17:04:01</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/29/2021 17:04:02</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/29/2021 17:04:02</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/29/2021 17:04:02</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/29/2021 17:04:02</publishTime>
+ <publishTime>09/29/2021 15:48:45</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
+ <publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
+ <publishTime>08/19/2014 18:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
+ <publishTime>11/28/2018 21:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>11/28/2018 20:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
+ <publishTime>11/28/2018 21:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
+ <publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>01/28/2015 12:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>02/11/2014 23:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>01/28/2015 12:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
+ <publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/29/2021 17:04:11</publishTime>
+ <publishTime>09/29/2021 15:48:50</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/29/2021 17:04:11</publishTime>
+ <publishTime>09/29/2021 15:48:50</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
+ <publishTime>07/18/2013 01:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
+ <publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
+ <publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2021 17:23:16</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/16/2021 17:23:15</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/29/2021 17:04:51</publishTime>
+ <publishTime>09/29/2021 15:48:54</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 7bf33cf..e4bab99 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -365,6 +365,7 @@
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 16d95e2..0cc8b55 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\Git浠撳簱\鏅轰簯杩堟�漒椤圭洰\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
index 324ed87..16a10b8 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.cs"
@@ -42,7 +42,24 @@
public void Sub_ClearBill()
{
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage1);
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
+ initGrid();
+ txtHBarCode.Text = "";
+ txtHProcExchBillNo.Enabled = true;
+ txtHWWWorkOrderBillNo.Enabled = true;
+ txtHProcNo.Enabled = true;
+ txtHBarCode.Enabled = true;
+ tabControl1.SelectedIndex = 0;
txtHBarCode.Focus();
+ lngBillKey = 0;
+ }
+
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
+ grdCardList.DataSource = null;
}
//杩涚珯鎸夐挳
private void cmdOK_Click(object sender, EventArgs e)
@@ -1414,6 +1431,7 @@
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
txtHProcExchBillNo.Text = "";
+ txtHBarCode.Text = "";
MessageBox.Show("鏈煡璇㈠埌娴佽浆鍗′俊鎭紒");
return;
}
@@ -1449,5 +1467,10 @@
//}
}
+ //鏂板
+ private void cmdXZ_Click(object sender, EventArgs e)
+ {
+ this.Sub_AddBill();
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.designer.cs"
index 2930993..fd6f8b7 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBill.designer.cs"
@@ -107,6 +107,7 @@
this.cmdHDelBill = new System.Windows.Forms.Button();
this.cmdXG = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
+ this.cmdXZ = new System.Windows.Forms.Button();
this.gbUp.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
@@ -123,10 +124,9 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Enabled = false;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(433, 209);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHMaterID.Location = new System.Drawing.Point(325, 167);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHMaterID.Size = new System.Drawing.Size(30, 32);
this.cmdHMaterID.TabIndex = 86;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Visible = false;
@@ -138,11 +138,10 @@
this.txtHMaterID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(150, 208);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(112, 166);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(282, 38);
+ this.txtHMaterID.Size = new System.Drawing.Size(212, 32);
this.txtHMaterID.TabIndex = 85;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -153,10 +152,9 @@
this.label16.BackColor = System.Drawing.Color.Gray;
this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.ForeColor = System.Drawing.Color.Yellow;
- this.label16.Location = new System.Drawing.Point(20, 208);
- this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Location = new System.Drawing.Point(15, 166);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(112, 27);
+ this.label16.Size = new System.Drawing.Size(90, 21);
this.label16.TabIndex = 84;
this.label16.Text = "浜у搧浠ｇ爜锛�";
//
@@ -166,10 +164,9 @@
this.label9.BackColor = System.Drawing.Color.Gray;
this.label9.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Yellow;
- this.label9.Location = new System.Drawing.Point(20, 339);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(15, 271);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(112, 27);
+ this.label9.Size = new System.Drawing.Size(90, 21);
this.label9.TabIndex = 82;
this.label9.Text = "鍙戝嚭鏃堕棿锛�";
//
@@ -179,10 +176,9 @@
this.label2.BackColor = System.Drawing.Color.Gray;
this.label2.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Yellow;
- this.label2.Location = new System.Drawing.Point(520, 45);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(390, 36);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(132, 27);
+ this.label2.Size = new System.Drawing.Size(106, 21);
this.label2.TabIndex = 80;
this.label2.Text = "鐢熶骇璁㈠崟鍙凤細";
//
@@ -192,11 +188,10 @@
this.txtHICMOBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(660, 45);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(495, 36);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(318, 38);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(240, 32);
this.txtHICMOBillNo.TabIndex = 81;
//
// txtHProcExchBillNo
@@ -204,11 +199,10 @@
this.txtHProcExchBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcExchBillNo.Location = new System.Drawing.Point(150, 32);
- this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(112, 26);
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
- this.txtHProcExchBillNo.Size = new System.Drawing.Size(323, 38);
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(243, 32);
this.txtHProcExchBillNo.TabIndex = 88;
this.txtHProcExchBillNo.Tag = "0";
this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
@@ -219,10 +213,9 @@
this.label1.BackColor = System.Drawing.Color.Gray;
this.label1.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Yellow;
- this.label1.Location = new System.Drawing.Point(20, 32);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(15, 26);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(92, 27);
+ this.label1.Size = new System.Drawing.Size(74, 21);
this.label1.TabIndex = 87;
this.label1.Text = "娴佽浆鍗★細";
//
@@ -232,11 +225,10 @@
this.txtHMaterModel.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterModel.Location = new System.Drawing.Point(150, 295);
- this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterModel.Location = new System.Drawing.Point(112, 236);
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(323, 38);
+ this.txtHMaterModel.Size = new System.Drawing.Size(243, 32);
this.txtHMaterModel.TabIndex = 90;
this.txtHMaterModel.Tag = "0";
//
@@ -246,10 +238,9 @@
this.label3.BackColor = System.Drawing.Color.Gray;
this.label3.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Yellow;
- this.label3.Location = new System.Drawing.Point(20, 295);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(15, 236);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(112, 27);
+ this.label3.Size = new System.Drawing.Size(90, 21);
this.label3.TabIndex = 89;
this.label3.Text = "瑙勬牸鍨嬪彿锛�";
//
@@ -257,10 +248,9 @@
//
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(424, 265);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHEmpID.Location = new System.Drawing.Point(318, 212);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHEmpID.Size = new System.Drawing.Size(30, 32);
this.cmdHEmpID.TabIndex = 93;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -271,10 +261,9 @@
this.txtHEmpID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(174, 266);
- this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHEmpID.Location = new System.Drawing.Point(130, 213);
this.txtHEmpID.Name = "txtHEmpID";
- this.txtHEmpID.Size = new System.Drawing.Size(249, 38);
+ this.txtHEmpID.Size = new System.Drawing.Size(188, 32);
this.txtHEmpID.TabIndex = 92;
this.txtHEmpID.Tag = "0";
this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -285,10 +274,9 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(34, 271);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(26, 217);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(104, 27);
+ this.label4.Size = new System.Drawing.Size(84, 21);
this.label4.TabIndex = 91;
this.label4.Text = "鎿� 浣� 鍛橈細";
this.label4.Visible = false;
@@ -297,10 +285,9 @@
//
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(424, 314);
- this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHSourceID.Location = new System.Drawing.Point(318, 251);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID.Size = new System.Drawing.Size(30, 32);
this.cmdHSourceID.TabIndex = 96;
this.cmdHSourceID.UseVisualStyleBackColor = false;
this.cmdHSourceID.Visible = false;
@@ -311,10 +298,9 @@
this.txtHSourceID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(174, 315);
- this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceID.Location = new System.Drawing.Point(130, 252);
this.txtHSourceID.Name = "txtHSourceID";
- this.txtHSourceID.Size = new System.Drawing.Size(249, 38);
+ this.txtHSourceID.Size = new System.Drawing.Size(188, 32);
this.txtHSourceID.TabIndex = 95;
this.txtHSourceID.Tag = "0";
this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
@@ -325,10 +311,9 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Yellow;
- this.label5.Location = new System.Drawing.Point(34, 321);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(26, 257);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(112, 27);
+ this.label5.Size = new System.Drawing.Size(90, 21);
this.label5.TabIndex = 94;
this.label5.Text = "鐢熶骇璧勬簮锛�";
this.label5.Visible = false;
@@ -338,11 +323,10 @@
this.txtHICMOQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOQty.Location = new System.Drawing.Point(174, 21);
- this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOQty.Location = new System.Drawing.Point(130, 17);
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
- this.txtHICMOQty.Size = new System.Drawing.Size(249, 38);
+ this.txtHICMOQty.Size = new System.Drawing.Size(188, 32);
this.txtHICMOQty.TabIndex = 98;
this.txtHICMOQty.Tag = "0";
//
@@ -352,10 +336,9 @@
this.label6.BackColor = System.Drawing.Color.Gray;
this.label6.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Yellow;
- this.label6.Location = new System.Drawing.Point(520, 221);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(390, 177);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(112, 27);
+ this.label6.Size = new System.Drawing.Size(90, 21);
this.label6.TabIndex = 97;
this.label6.Text = "娴佽浆鍗℃暟锛�";
//
@@ -365,11 +348,10 @@
this.txtHPlanQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(660, 221);
- this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPlanQty.Location = new System.Drawing.Point(495, 177);
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(318, 38);
+ this.txtHPlanQty.Size = new System.Drawing.Size(240, 32);
this.txtHPlanQty.TabIndex = 100;
this.txtHPlanQty.Tag = "0";
//
@@ -379,10 +361,9 @@
this.label7.BackColor = System.Drawing.Color.Gray;
this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Yellow;
- this.label7.Location = new System.Drawing.Point(520, 177);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(390, 142);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(112, 27);
+ this.label7.Size = new System.Drawing.Size(90, 21);
this.label7.TabIndex = 99;
this.label7.Text = "鍙戝嚭鏁伴噺锛�";
//
@@ -391,10 +372,9 @@
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHGroupID.Location = new System.Drawing.Point(1526, 63);
- this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHGroupID.Location = new System.Drawing.Point(1144, 50);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHGroupID.Size = new System.Drawing.Size(22, 22);
this.cmdHGroupID.TabIndex = 103;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Visible = false;
@@ -405,10 +385,9 @@
this.txtHGroupID.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupID.Location = new System.Drawing.Point(1306, 62);
- this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHGroupID.Location = new System.Drawing.Point(980, 50);
this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(220, 27);
+ this.txtHGroupID.Size = new System.Drawing.Size(166, 23);
this.txtHGroupID.TabIndex = 102;
this.txtHGroupID.Tag = "0";
this.txtHGroupID.Visible = false;
@@ -420,10 +399,9 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Yellow;
- this.label8.Location = new System.Drawing.Point(1164, 62);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(873, 50);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(112, 27);
+ this.label8.Size = new System.Drawing.Size(90, 21);
this.label8.TabIndex = 101;
this.label8.Text = "鐢熶骇鐝粍锛�";
this.label8.Visible = false;
@@ -433,10 +411,9 @@
this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcID.Enabled = false;
this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
- this.cmdHProcID.Location = new System.Drawing.Point(433, 121);
- this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHProcID.Location = new System.Drawing.Point(325, 97);
this.cmdHProcID.Name = "cmdHProcID";
- this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHProcID.Size = new System.Drawing.Size(30, 32);
this.cmdHProcID.TabIndex = 106;
this.cmdHProcID.UseVisualStyleBackColor = false;
this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
@@ -447,11 +424,10 @@
this.txtHProcID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcID.ForeColor = System.Drawing.Color.Green;
this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcID.Location = new System.Drawing.Point(150, 120);
- this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcID.Location = new System.Drawing.Point(112, 96);
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
- this.txtHProcID.Size = new System.Drawing.Size(282, 38);
+ this.txtHProcID.Size = new System.Drawing.Size(212, 32);
this.txtHProcID.TabIndex = 105;
this.txtHProcID.Tag = "0";
this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
@@ -463,10 +439,9 @@
this.label10.BackColor = System.Drawing.Color.Gray;
this.label10.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Yellow;
- this.label10.Location = new System.Drawing.Point(20, 120);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(15, 96);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(112, 27);
+ this.label10.Size = new System.Drawing.Size(90, 21);
this.label10.TabIndex = 104;
this.label10.Text = "褰撳墠宸ュ簭锛�";
//
@@ -476,11 +451,10 @@
this.txtHMaterName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterName.Location = new System.Drawing.Point(150, 251);
- this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterName.Location = new System.Drawing.Point(112, 201);
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(323, 38);
+ this.txtHMaterName.Size = new System.Drawing.Size(243, 32);
this.txtHMaterName.TabIndex = 108;
this.txtHMaterName.Tag = "0";
//
@@ -490,19 +464,17 @@
this.label11.BackColor = System.Drawing.Color.Gray;
this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Yellow;
- this.label11.Location = new System.Drawing.Point(20, 251);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(15, 201);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(112, 27);
+ this.label11.Size = new System.Drawing.Size(90, 21);
this.label11.TabIndex = 107;
this.label11.Text = "浜у搧鍚嶇О锛�";
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(336, 14);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdOK.Location = new System.Drawing.Point(289, 11);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(105, 52);
+ this.cmdOK.Size = new System.Drawing.Size(70, 42);
this.cmdOK.TabIndex = 109;
this.cmdOK.Text = "鍙� 鍑�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -511,10 +483,9 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(473, 14);
- this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdCancel.Location = new System.Drawing.Point(376, 11);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(92, 52);
+ this.cmdCancel.Size = new System.Drawing.Size(70, 42);
this.cmdCancel.TabIndex = 110;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -526,10 +497,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Gray;
this.lblCaption.Font = new System.Drawing.Font("寰蒋闆呴粦", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
- this.lblCaption.Location = new System.Drawing.Point(22, 11);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(16, 9);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(158, 31);
+ this.lblCaption.Size = new System.Drawing.Size(126, 26);
this.lblCaption.TabIndex = 111;
this.lblCaption.Text = "濮斿宸ュ簭鍙戝嚭";
//
@@ -544,10 +514,8 @@
this.gbUp.Controls.Add(this.label8);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Location = new System.Drawing.Point(0, 0);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1341, 673);
+ this.gbUp.Size = new System.Drawing.Size(1006, 538);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
//
@@ -557,9 +525,11 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
- this.groupBox1.Location = new System.Drawing.Point(1029, 91);
+ this.groupBox1.Location = new System.Drawing.Point(772, 72);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(308, 578);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Size = new System.Drawing.Size(231, 463);
this.groupBox1.TabIndex = 182;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "鏈緵搴斿晢宸ュ崟";
@@ -568,11 +538,12 @@
//
this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdCardList.Location = new System.Drawing.Point(3, 26);
+ this.grdCardList.Location = new System.Drawing.Point(2, 21);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.grdCardList.Name = "grdCardList";
this.grdCardList.RowHeadersWidth = 51;
this.grdCardList.RowTemplate.Height = 27;
- this.grdCardList.Size = new System.Drawing.Size(302, 549);
+ this.grdCardList.Size = new System.Drawing.Size(227, 440);
this.grdCardList.TabIndex = 150;
//
// tabControl1
@@ -580,10 +551,11 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Left;
- this.tabControl1.Location = new System.Drawing.Point(4, 91);
+ this.tabControl1.Location = new System.Drawing.Point(3, 72);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1025, 578);
+ this.tabControl1.Size = new System.Drawing.Size(769, 463);
this.tabControl1.TabIndex = 162;
//
// tabPage1
@@ -624,10 +596,11 @@
this.tabPage1.Controls.Add(this.txtHMaterModel);
this.tabPage1.Controls.Add(this.cmdHProcID);
this.tabPage1.Controls.Add(this.txtHStationInTime);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1017, 549);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage1.Size = new System.Drawing.Size(761, 437);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍩烘湰淇℃伅";
//
@@ -637,10 +610,9 @@
this.label24.BackColor = System.Drawing.Color.Gray;
this.label24.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.ForeColor = System.Drawing.Color.Yellow;
- this.label24.Location = new System.Drawing.Point(520, 308);
- this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Location = new System.Drawing.Point(390, 246);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(132, 27);
+ this.label24.Size = new System.Drawing.Size(106, 21);
this.label24.TabIndex = 160;
this.label24.Text = "濮斿宸ュ崟鍙凤細";
//
@@ -649,10 +621,9 @@
this.txtHWWWorkOrderBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWWWorkOrderBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHWWWorkOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(660, 308);
- this.txtHWWWorkOrderBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(495, 246);
this.txtHWWWorkOrderBillNo.Name = "txtHWWWorkOrderBillNo";
- this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(318, 38);
+ this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(240, 32);
this.txtHWWWorkOrderBillNo.TabIndex = 161;
this.txtHWWWorkOrderBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWWWorkOrderBillNo_KeyDown);
//
@@ -662,10 +633,9 @@
this.label22.BackColor = System.Drawing.Color.Gray;
this.label22.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.ForeColor = System.Drawing.Color.Yellow;
- this.label22.Location = new System.Drawing.Point(20, 76);
- this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Location = new System.Drawing.Point(15, 61);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(104, 27);
+ this.label22.Size = new System.Drawing.Size(84, 21);
this.label22.TabIndex = 156;
this.label22.Text = "娴� 姘� 鍙凤細";
//
@@ -675,11 +645,10 @@
this.txtHOrderProcNO.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(660, 264);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(495, 211);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(318, 38);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(240, 32);
this.txtHOrderProcNO.TabIndex = 159;
this.txtHOrderProcNO.Tag = "0";
//
@@ -689,10 +658,9 @@
this.label20.BackColor = System.Drawing.Color.Gray;
this.label20.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.ForeColor = System.Drawing.Color.Yellow;
- this.label20.Location = new System.Drawing.Point(20, 379);
- this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Location = new System.Drawing.Point(15, 303);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(102, 27);
+ this.label20.Size = new System.Drawing.Size(83, 21);
this.label20.TabIndex = 129;
this.label20.Text = "澶� 娉細";
//
@@ -701,10 +669,9 @@
this.txtHProcNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcNo.Location = new System.Drawing.Point(150, 76);
- this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcNo.Location = new System.Drawing.Point(112, 61);
this.txtHProcNo.Name = "txtHProcNo";
- this.txtHProcNo.Size = new System.Drawing.Size(323, 38);
+ this.txtHProcNo.Size = new System.Drawing.Size(243, 32);
this.txtHProcNo.TabIndex = 157;
this.txtHProcNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNo_KeyDown);
//
@@ -713,11 +680,10 @@
this.txtHRemark.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHRemark.ForeColor = System.Drawing.Color.Green;
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(150, 382);
- this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHRemark.Location = new System.Drawing.Point(112, 306);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(828, 96);
+ this.txtHRemark.Size = new System.Drawing.Size(622, 78);
this.txtHRemark.TabIndex = 130;
//
// label23
@@ -726,10 +692,9 @@
this.label23.BackColor = System.Drawing.Color.Gray;
this.label23.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.ForeColor = System.Drawing.Color.Yellow;
- this.label23.Location = new System.Drawing.Point(520, 264);
- this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Location = new System.Drawing.Point(390, 211);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(132, 27);
+ this.label23.Size = new System.Drawing.Size(106, 21);
this.label23.TabIndex = 158;
this.label23.Text = "璁㈠崟璺熻釜鍙凤細";
//
@@ -739,11 +704,10 @@
this.txtHBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(660, 133);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(495, 106);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(318, 38);
+ this.txtHBillNo.Size = new System.Drawing.Size(240, 32);
this.txtHBillNo.TabIndex = 115;
//
// label12
@@ -752,10 +716,9 @@
this.label12.BackColor = System.Drawing.Color.Gray;
this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Yellow;
- this.label12.Location = new System.Drawing.Point(520, 133);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(390, 106);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(104, 27);
+ this.label12.Size = new System.Drawing.Size(84, 21);
this.label12.TabIndex = 114;
this.label12.Text = "鍗� 鎹� 鍙凤細";
//
@@ -764,10 +727,9 @@
this.txtHQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQty.ForeColor = System.Drawing.Color.Green;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(660, 177);
- this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHQty.Location = new System.Drawing.Point(495, 142);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(318, 38);
+ this.txtHQty.Size = new System.Drawing.Size(240, 32);
this.txtHQty.TabIndex = 117;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -779,10 +741,9 @@
this.label26.BackColor = System.Drawing.Color.Gray;
this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label26.ForeColor = System.Drawing.Color.Yellow;
- this.label26.Location = new System.Drawing.Point(520, 89);
- this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Location = new System.Drawing.Point(390, 71);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(114, 27);
+ this.label26.Size = new System.Drawing.Size(93, 21);
this.label26.TabIndex = 154;
this.label26.Text = "绋� 鐜囷細";
this.label26.Visible = false;
@@ -792,11 +753,10 @@
this.txtHTaxRate.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHTaxRate.ForeColor = System.Drawing.Color.Green;
this.txtHTaxRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHTaxRate.Location = new System.Drawing.Point(660, 89);
- this.txtHTaxRate.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHTaxRate.Location = new System.Drawing.Point(495, 71);
this.txtHTaxRate.Name = "txtHTaxRate";
this.txtHTaxRate.ReadOnly = true;
- this.txtHTaxRate.Size = new System.Drawing.Size(318, 38);
+ this.txtHTaxRate.Size = new System.Drawing.Size(240, 32);
this.txtHTaxRate.TabIndex = 155;
this.txtHTaxRate.Visible = false;
this.txtHTaxRate.TextChanged += new System.EventHandler(this.txtHTaxRate_TextChanged);
@@ -805,10 +765,9 @@
//
this.cmbHSupID.BackColor = System.Drawing.Color.Transparent;
this.cmbHSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmbHSupID.Image")));
- this.cmbHSupID.Location = new System.Drawing.Point(433, 165);
- this.cmbHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHSupID.Location = new System.Drawing.Point(325, 132);
this.cmbHSupID.Name = "cmbHSupID";
- this.cmbHSupID.Size = new System.Drawing.Size(40, 40);
+ this.cmbHSupID.Size = new System.Drawing.Size(30, 32);
this.cmbHSupID.TabIndex = 120;
this.cmbHSupID.UseVisualStyleBackColor = false;
this.cmbHSupID.Click += new System.EventHandler(this.cmbHSupID_Click);
@@ -819,10 +778,9 @@
this.txtHSupID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSupID.ForeColor = System.Drawing.Color.Green;
this.txtHSupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupID.Location = new System.Drawing.Point(150, 164);
- this.txtHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSupID.Location = new System.Drawing.Point(112, 131);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(282, 38);
+ this.txtHSupID.Size = new System.Drawing.Size(212, 32);
this.txtHSupID.TabIndex = 119;
this.txtHSupID.Tag = "0";
this.txtHSupID.TextChanged += new System.EventHandler(this.txtHSupID_TextChanged);
@@ -834,10 +792,9 @@
this.label14.BackColor = System.Drawing.Color.Gray;
this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Yellow;
- this.label14.Location = new System.Drawing.Point(20, 164);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(15, 131);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(104, 27);
+ this.label14.Size = new System.Drawing.Size(84, 21);
this.label14.TabIndex = 118;
this.label14.Text = "渚� 搴� 鍟嗭細";
//
@@ -847,11 +804,10 @@
this.txtHStationInTime.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHStationInTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationInTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHStationInTime.Location = new System.Drawing.Point(150, 339);
- this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHStationInTime.Location = new System.Drawing.Point(112, 271);
this.txtHStationInTime.Name = "txtHStationInTime";
this.txtHStationInTime.ReadOnly = true;
- this.txtHStationInTime.Size = new System.Drawing.Size(323, 38);
+ this.txtHStationInTime.Size = new System.Drawing.Size(243, 32);
this.txtHStationInTime.TabIndex = 113;
this.txtHStationInTime.Tag = "0";
//
@@ -876,10 +832,11 @@
this.tabPage2.Controls.Add(this.label4);
this.tabPage2.Controls.Add(this.txtHInnerBillNo);
this.tabPage2.Controls.Add(this.txtHEmpID);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(1017, 549);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage2.Size = new System.Drawing.Size(761, 440);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍏朵粬淇℃伅";
//
@@ -889,10 +846,9 @@
this.label17.BackColor = System.Drawing.Color.Gray;
this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ForeColor = System.Drawing.Color.Yellow;
- this.label17.Location = new System.Drawing.Point(34, 71);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(26, 57);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(112, 27);
+ this.label17.Size = new System.Drawing.Size(90, 21);
this.label17.TabIndex = 123;
this.label17.Text = "鍙戝嚭浠舵暟锛�";
this.label17.Visible = false;
@@ -903,10 +859,9 @@
this.label13.BackColor = System.Drawing.Color.Gray;
this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Yellow;
- this.label13.Location = new System.Drawing.Point(34, 21);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(26, 17);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(132, 27);
+ this.label13.Size = new System.Drawing.Size(106, 21);
this.label13.TabIndex = 116;
this.label13.Text = "浠诲姟鍗曟暟閲忥細";
this.label13.Visible = false;
@@ -917,10 +872,9 @@
this.txtHPieceQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPieceQty.Location = new System.Drawing.Point(174, 70);
- this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPieceQty.Location = new System.Drawing.Point(130, 56);
this.txtHPieceQty.Name = "txtHPieceQty";
- this.txtHPieceQty.Size = new System.Drawing.Size(249, 38);
+ this.txtHPieceQty.Size = new System.Drawing.Size(188, 32);
this.txtHPieceQty.TabIndex = 124;
this.txtHPieceQty.Tag = "0";
//
@@ -929,10 +883,9 @@
this.txtHPrice.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPrice.ForeColor = System.Drawing.Color.Green;
this.txtHPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPrice.Location = new System.Drawing.Point(174, 217);
- this.txtHPrice.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPrice.Location = new System.Drawing.Point(130, 174);
this.txtHPrice.Name = "txtHPrice";
- this.txtHPrice.Size = new System.Drawing.Size(249, 38);
+ this.txtHPrice.Size = new System.Drawing.Size(188, 32);
this.txtHPrice.TabIndex = 126;
this.txtHPrice.TextChanged += new System.EventHandler(this.txtHPrice_TextChanged);
this.txtHPrice.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHPrice_KeyDown);
@@ -943,10 +896,9 @@
this.txtHSourceName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName.Location = new System.Drawing.Point(174, 364);
- this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceName.Location = new System.Drawing.Point(130, 291);
this.txtHSourceName.Name = "txtHSourceName";
- this.txtHSourceName.Size = new System.Drawing.Size(249, 38);
+ this.txtHSourceName.Size = new System.Drawing.Size(188, 32);
this.txtHSourceName.TabIndex = 122;
this.txtHSourceName.Tag = "0";
this.txtHSourceName.Visible = false;
@@ -956,10 +908,9 @@
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.ForeColor = System.Drawing.Color.Yellow;
- this.label15.Location = new System.Drawing.Point(34, 367);
- this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Location = new System.Drawing.Point(26, 294);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(108, 27);
+ this.label15.Size = new System.Drawing.Size(88, 21);
this.label15.TabIndex = 121;
this.label15.Text = "鏈� 鍙帮細";
this.label15.Visible = false;
@@ -970,10 +921,9 @@
this.label18.BackColor = System.Drawing.Color.Gray;
this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.ForeColor = System.Drawing.Color.Yellow;
- this.label18.Location = new System.Drawing.Point(34, 221);
- this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Location = new System.Drawing.Point(26, 177);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(102, 27);
+ this.label18.Size = new System.Drawing.Size(83, 21);
this.label18.TabIndex = 125;
this.label18.Text = "鍗� 浠凤細";
this.label18.Visible = false;
@@ -983,11 +933,10 @@
this.txtHMoney.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMoney.ForeColor = System.Drawing.Color.Green;
this.txtHMoney.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMoney.Location = new System.Drawing.Point(174, 119);
- this.txtHMoney.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMoney.Location = new System.Drawing.Point(130, 95);
this.txtHMoney.Name = "txtHMoney";
this.txtHMoney.ReadOnly = true;
- this.txtHMoney.Size = new System.Drawing.Size(249, 38);
+ this.txtHMoney.Size = new System.Drawing.Size(188, 32);
this.txtHMoney.TabIndex = 128;
this.txtHMoney.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMoney_KeyDown);
this.txtHMoney.Leave += new System.EventHandler(this.txtHMoney_Leave);
@@ -998,10 +947,9 @@
this.label21.BackColor = System.Drawing.Color.Gray;
this.label21.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.Color.Yellow;
- this.label21.Location = new System.Drawing.Point(34, 171);
- this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Location = new System.Drawing.Point(26, 137);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(112, 27);
+ this.label21.Size = new System.Drawing.Size(90, 21);
this.label21.TabIndex = 148;
this.label21.Text = "閫佽揣鍗曞彿锛�";
this.label21.Visible = false;
@@ -1012,10 +960,9 @@
this.label19.BackColor = System.Drawing.Color.Gray;
this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.ForeColor = System.Drawing.Color.Yellow;
- this.label19.Location = new System.Drawing.Point(34, 121);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Location = new System.Drawing.Point(26, 97);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(102, 27);
+ this.label19.Size = new System.Drawing.Size(83, 21);
this.label19.TabIndex = 127;
this.label19.Text = "閲� 棰濓細";
this.label19.Visible = false;
@@ -1025,10 +972,9 @@
this.txtHInnerBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHInnerBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(174, 168);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(130, 134);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 38);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(188, 32);
this.txtHInnerBillNo.TabIndex = 149;
//
// panel3
@@ -1037,9 +983,10 @@
this.panel3.Controls.Add(this.label25);
this.panel3.Controls.Add(this.lblCaption);
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel3.Location = new System.Drawing.Point(4, 22);
+ this.panel3.Location = new System.Drawing.Point(3, 17);
+ this.panel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(1333, 69);
+ this.panel3.Size = new System.Drawing.Size(1000, 55);
this.panel3.TabIndex = 163;
//
// txtHBarCode
@@ -1047,11 +994,10 @@
this.txtHBarCode.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(307, 11);
- this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBarCode.Location = new System.Drawing.Point(230, 9);
this.txtHBarCode.Multiline = true;
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(304, 40);
+ this.txtHBarCode.Size = new System.Drawing.Size(229, 33);
this.txtHBarCode.TabIndex = 115;
this.txtHBarCode.Tag = "0";
this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
@@ -1062,19 +1008,17 @@
this.label25.BackColor = System.Drawing.Color.Gray;
this.label25.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.ForeColor = System.Drawing.Color.Yellow;
- this.label25.Location = new System.Drawing.Point(207, 15);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Location = new System.Drawing.Point(155, 12);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(92, 27);
+ this.label25.Size = new System.Drawing.Size(74, 21);
this.label25.TabIndex = 114;
this.label25.Text = "鏉″舰鐮侊細";
//
// cmdAddNew
//
- this.cmdAddNew.Location = new System.Drawing.Point(971, 14);
- this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdAddNew.Location = new System.Drawing.Point(724, 11);
this.cmdAddNew.Name = "cmdAddNew";
- this.cmdAddNew.Size = new System.Drawing.Size(123, 52);
+ this.cmdAddNew.Size = new System.Drawing.Size(70, 42);
this.cmdAddNew.TabIndex = 114;
this.cmdAddNew.Text = "娓� 绌�";
this.cmdAddNew.UseVisualStyleBackColor = true;
@@ -1088,6 +1032,7 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.cmdXZ);
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.button1);
@@ -1097,17 +1042,17 @@
this.panel1.Controls.Add(this.cmdCancel);
this.panel1.Controls.Add(this.cmdOK);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 673);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(0, 538);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1341, 81);
+ this.panel1.Size = new System.Drawing.Size(1006, 65);
this.panel1.TabIndex = 115;
//
// button3
//
- this.button3.Location = new System.Drawing.Point(864, 14);
+ this.button3.Location = new System.Drawing.Point(637, 11);
+ this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(98, 49);
+ this.button3.Size = new System.Drawing.Size(70, 42);
this.button3.TabIndex = 150;
this.button3.Text = "鎵撳嵃";
this.button3.UseVisualStyleBackColor = true;
@@ -1117,10 +1062,9 @@
// button2
//
this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(733, 14);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Location = new System.Drawing.Point(550, 11);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(102, 52);
+ this.button2.Size = new System.Drawing.Size(70, 42);
this.button2.TabIndex = 149;
this.button2.Text = "鍙嶅鏍�";
this.button2.UseVisualStyleBackColor = true;
@@ -1128,10 +1072,9 @@
// button1
//
this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(614, 14);
- this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Location = new System.Drawing.Point(463, 11);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(102, 52);
+ this.button1.Size = new System.Drawing.Size(70, 42);
this.button1.TabIndex = 148;
this.button1.Text = "瀹� 鏍�";
this.button1.UseVisualStyleBackColor = true;
@@ -1139,10 +1082,9 @@
//
// cmdHDelBill
//
- this.cmdHDelBill.Location = new System.Drawing.Point(145, 14);
- this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHDelBill.Location = new System.Drawing.Point(192, 11);
this.cmdHDelBill.Name = "cmdHDelBill";
- this.cmdHDelBill.Size = new System.Drawing.Size(106, 52);
+ this.cmdHDelBill.Size = new System.Drawing.Size(80, 42);
this.cmdHDelBill.TabIndex = 122;
this.cmdHDelBill.Text = "鍒犻櫎棰嗘枡鍗�";
this.cmdHDelBill.UseVisualStyleBackColor = true;
@@ -1151,10 +1093,9 @@
//
// cmdXG
//
- this.cmdXG.Location = new System.Drawing.Point(21, 14);
- this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdXG.Location = new System.Drawing.Point(105, 11);
this.cmdXG.Name = "cmdXG";
- this.cmdXG.Size = new System.Drawing.Size(93, 52);
+ this.cmdXG.Size = new System.Drawing.Size(70, 42);
this.cmdXG.TabIndex = 120;
this.cmdXG.Text = "淇� 鏀�";
this.cmdXG.UseVisualStyleBackColor = true;
@@ -1165,22 +1106,30 @@
this.panel2.Controls.Add(this.gbUp);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1341, 673);
+ this.panel2.Size = new System.Drawing.Size(1006, 538);
this.panel2.TabIndex = 116;
+ //
+ // cmdXZ
+ //
+ this.cmdXZ.Location = new System.Drawing.Point(18, 11);
+ this.cmdXZ.Name = "cmdXZ";
+ this.cmdXZ.Size = new System.Drawing.Size(70, 42);
+ this.cmdXZ.TabIndex = 151;
+ this.cmdXZ.Text = "鏂� 澧�";
+ this.cmdXZ.UseVisualStyleBackColor = true;
+ this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
//
// MES_StationEntrustInBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Gray;
- this.ClientSize = new System.Drawing.Size(1341, 754);
+ this.ClientSize = new System.Drawing.Size(1006, 603);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustInBill";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "濮斿宸ュ簭鍙戝嚭";
@@ -1284,5 +1233,6 @@
private System.Windows.Forms.DataGridView grdCardList;
private System.Windows.Forms.TextBox txtHBarCode;
private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Button cmdXZ;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
index c666828..37d803f 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
@@ -85,10 +85,23 @@
{
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
//DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp2);
- txtHBarCode.Focus();
- txtHTaxRate.Text = "16";
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage1);
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
initGrid();
initGrid_Sub();
+ txtHBarCode.Text = "";
+ txtHProcExchBillNo.Enabled = true;
+ txtHWWWorkOrderBillNo.Enabled = true;
+ txtHProcNO.Enabled = true;
+ txtHBarCode.Enabled = true;
+ txtHPieceQty.Enabled = true;
+ txtHBadPNL.Enabled = true;
+ tabControl1.SelectedIndex = 0;
+ txtHBarCode.Focus();
+ lngBillKey = 0;
+ lngBillSubKey = 0;
+ txtHTaxRate.Text = "16";
+ this.txtHICMOBillNo.Tag = "0";
}
//鍑虹珯鎸夐挳
private void cmdOK_Click(object sender, EventArgs e)
@@ -859,6 +872,8 @@
//鍒濆鍖朑RID
private void initGrid()
{
+ DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
+ grdCardList.DataSource = null;
//
grdMain.ColumnCount = 10; //鎬诲垪鏁�
@@ -2424,6 +2439,7 @@
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
txtHProcExchBillNo.Text = "";
+ txtHBarCode.Text = "";
MessageBox.Show("鏈煡璇㈠埌娴佽浆鍗′俊鎭紒");
return;
}
@@ -2459,5 +2475,10 @@
//}
}
+ //鏂板
+ private void cmdXZ_Click(object sender, EventArgs e)
+ {
+ this.Sub_AddBill();
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
index f5c8e34..8343057 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.designer.cs"
@@ -122,6 +122,7 @@
this.cmdCancel = new System.Windows.Forms.Button();
this.cmdOK = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
+ this.cmdXZ = new System.Windows.Forms.Button();
this.gbUp.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
@@ -140,10 +141,9 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Enabled = false;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(374, 191);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHMaterID.Location = new System.Drawing.Point(280, 153);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHMaterID.Size = new System.Drawing.Size(30, 32);
this.cmdHMaterID.TabIndex = 86;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
@@ -154,11 +154,10 @@
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(162, 191);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(122, 153);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(214, 34);
+ this.txtHMaterID.Size = new System.Drawing.Size(162, 28);
this.txtHMaterID.TabIndex = 85;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -169,10 +168,9 @@
this.label16.BackColor = System.Drawing.Color.Gray;
this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.ForeColor = System.Drawing.Color.Yellow;
- this.label16.Location = new System.Drawing.Point(22, 191);
- this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Location = new System.Drawing.Point(16, 153);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(112, 27);
+ this.label16.Size = new System.Drawing.Size(90, 21);
this.label16.TabIndex = 84;
this.label16.Text = "浜у搧浠ｇ爜锛�";
//
@@ -182,10 +180,9 @@
this.label9.BackColor = System.Drawing.Color.Gray;
this.label9.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Yellow;
- this.label9.Location = new System.Drawing.Point(455, 59);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(341, 47);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(112, 27);
+ this.label9.Size = new System.Drawing.Size(90, 21);
this.label9.TabIndex = 82;
this.label9.Text = "鎺ユ敹鏃堕棿锛�";
//
@@ -195,10 +192,9 @@
this.label2.BackColor = System.Drawing.Color.Gray;
this.label2.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Yellow;
- this.label2.Location = new System.Drawing.Point(22, 103);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(16, 82);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(112, 27);
+ this.label2.Size = new System.Drawing.Size(90, 21);
this.label2.TabIndex = 80;
this.label2.Text = "鐢熶骇璁㈠崟锛�";
//
@@ -207,11 +203,10 @@
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(162, 103);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(122, 82);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(252, 34);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(190, 28);
this.txtHICMOBillNo.TabIndex = 81;
//
// txtHProcExchBillNo
@@ -219,11 +214,10 @@
this.txtHProcExchBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcExchBillNo.Location = new System.Drawing.Point(162, 15);
- this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(122, 12);
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
- this.txtHProcExchBillNo.Size = new System.Drawing.Size(252, 34);
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(190, 28);
this.txtHProcExchBillNo.TabIndex = 88;
this.txtHProcExchBillNo.Tag = "0";
this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
@@ -234,10 +228,9 @@
this.label1.BackColor = System.Drawing.Color.Gray;
this.label1.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Yellow;
- this.label1.Location = new System.Drawing.Point(22, 15);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(16, 12);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(92, 27);
+ this.label1.Size = new System.Drawing.Size(74, 21);
this.label1.TabIndex = 87;
this.label1.Text = "娴佽浆鍗★細";
//
@@ -247,11 +240,10 @@
this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterModel.Location = new System.Drawing.Point(162, 277);
- this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterModel.Location = new System.Drawing.Point(122, 222);
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(252, 34);
+ this.txtHMaterModel.Size = new System.Drawing.Size(190, 28);
this.txtHMaterModel.TabIndex = 90;
this.txtHMaterModel.Tag = "0";
//
@@ -261,10 +253,9 @@
this.label3.BackColor = System.Drawing.Color.Gray;
this.label3.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Yellow;
- this.label3.Location = new System.Drawing.Point(22, 277);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(16, 222);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(112, 27);
+ this.label3.Size = new System.Drawing.Size(90, 21);
this.label3.TabIndex = 89;
this.label3.Text = "瑙勬牸鍨嬪彿锛�";
//
@@ -272,10 +263,9 @@
//
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(803, 41);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHEmpID.Location = new System.Drawing.Point(602, 33);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHEmpID.Size = new System.Drawing.Size(30, 32);
this.cmdHEmpID.TabIndex = 93;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -285,10 +275,9 @@
this.txtHEmpID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(559, 41);
- this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHEmpID.Location = new System.Drawing.Point(419, 33);
this.txtHEmpID.Name = "txtHEmpID";
- this.txtHEmpID.Size = new System.Drawing.Size(245, 38);
+ this.txtHEmpID.Size = new System.Drawing.Size(185, 32);
this.txtHEmpID.TabIndex = 92;
this.txtHEmpID.Tag = "0";
this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -299,10 +288,9 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(444, 82);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(333, 66);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(104, 27);
+ this.label4.Size = new System.Drawing.Size(84, 21);
this.label4.TabIndex = 91;
this.label4.Text = "鎿� 浣� 鍛橈細";
//
@@ -310,10 +298,9 @@
//
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(804, 162);
- this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHSourceID.Location = new System.Drawing.Point(603, 130);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID.Size = new System.Drawing.Size(30, 32);
this.cmdHSourceID.TabIndex = 96;
this.cmdHSourceID.UseVisualStyleBackColor = false;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -323,10 +310,9 @@
this.txtHSourceID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(559, 162);
- this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceID.Location = new System.Drawing.Point(419, 130);
this.txtHSourceID.Name = "txtHSourceID";
- this.txtHSourceID.Size = new System.Drawing.Size(245, 38);
+ this.txtHSourceID.Size = new System.Drawing.Size(185, 32);
this.txtHSourceID.TabIndex = 95;
this.txtHSourceID.Tag = "0";
this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
@@ -337,10 +323,9 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Yellow;
- this.label5.Location = new System.Drawing.Point(444, 171);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(333, 137);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(112, 27);
+ this.label5.Size = new System.Drawing.Size(90, 21);
this.label5.TabIndex = 94;
this.label5.Text = "鐢熶骇璧勬簮锛�";
//
@@ -349,11 +334,10 @@
this.txtHICMOQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOQty.Location = new System.Drawing.Point(164, 77);
- this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOQty.Location = new System.Drawing.Point(123, 62);
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
- this.txtHICMOQty.Size = new System.Drawing.Size(249, 38);
+ this.txtHICMOQty.Size = new System.Drawing.Size(188, 32);
this.txtHICMOQty.TabIndex = 98;
this.txtHICMOQty.Tag = "0";
//
@@ -363,10 +347,9 @@
this.label6.BackColor = System.Drawing.Color.Gray;
this.label6.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Yellow;
- this.label6.Location = new System.Drawing.Point(38, 344);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(28, 275);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(112, 27);
+ this.label6.Size = new System.Drawing.Size(90, 21);
this.label6.TabIndex = 97;
this.label6.Text = "鍙戝嚭涓暟锛�";
//
@@ -375,11 +358,10 @@
this.txtHPlanQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(559, 121);
- this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPlanQty.Location = new System.Drawing.Point(419, 97);
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(284, 38);
+ this.txtHPlanQty.Size = new System.Drawing.Size(214, 32);
this.txtHPlanQty.TabIndex = 100;
this.txtHPlanQty.Tag = "0";
//
@@ -389,10 +371,9 @@
this.label7.BackColor = System.Drawing.Color.Gray;
this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Yellow;
- this.label7.Location = new System.Drawing.Point(455, 103);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(341, 82);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(112, 27);
+ this.label7.Size = new System.Drawing.Size(90, 21);
this.label7.TabIndex = 99;
this.label7.Text = "鎺ユ敹鏁伴噺锛�";
//
@@ -400,10 +381,9 @@
//
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
- this.cmdHGroupID.Location = new System.Drawing.Point(372, 274);
- this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHGroupID.Location = new System.Drawing.Point(279, 219);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHGroupID.Size = new System.Drawing.Size(30, 32);
this.cmdHGroupID.TabIndex = 103;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -414,10 +394,9 @@
this.txtHGroupID.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupID.Location = new System.Drawing.Point(164, 236);
- this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHGroupID.Location = new System.Drawing.Point(123, 189);
this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(249, 38);
+ this.txtHGroupID.Size = new System.Drawing.Size(188, 32);
this.txtHGroupID.TabIndex = 102;
this.txtHGroupID.Tag = "0";
this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
@@ -428,10 +407,9 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Yellow;
- this.label8.Location = new System.Drawing.Point(18, 271);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(14, 217);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(112, 27);
+ this.label8.Size = new System.Drawing.Size(90, 21);
this.label8.TabIndex = 101;
this.label8.Text = "鐢熶骇鐝粍锛�";
//
@@ -440,10 +418,9 @@
this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcID.Enabled = false;
this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
- this.cmdHProcID.Location = new System.Drawing.Point(374, 147);
- this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHProcID.Location = new System.Drawing.Point(280, 118);
this.cmdHProcID.Name = "cmdHProcID";
- this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
+ this.cmdHProcID.Size = new System.Drawing.Size(30, 32);
this.cmdHProcID.TabIndex = 106;
this.cmdHProcID.UseVisualStyleBackColor = false;
this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
@@ -454,11 +431,10 @@
this.txtHProcID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcID.ForeColor = System.Drawing.Color.Green;
this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcID.Location = new System.Drawing.Point(162, 147);
- this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcID.Location = new System.Drawing.Point(122, 118);
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
- this.txtHProcID.Size = new System.Drawing.Size(214, 34);
+ this.txtHProcID.Size = new System.Drawing.Size(162, 28);
this.txtHProcID.TabIndex = 105;
this.txtHProcID.Tag = "0";
this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
@@ -470,10 +446,9 @@
this.label10.BackColor = System.Drawing.Color.Gray;
this.label10.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Yellow;
- this.label10.Location = new System.Drawing.Point(22, 147);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(16, 118);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(112, 27);
+ this.label10.Size = new System.Drawing.Size(90, 21);
this.label10.TabIndex = 104;
this.label10.Text = "褰撳墠宸ュ簭锛�";
//
@@ -483,11 +458,10 @@
this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterName.Location = new System.Drawing.Point(162, 234);
- this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterName.Location = new System.Drawing.Point(122, 187);
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(252, 34);
+ this.txtHMaterName.Size = new System.Drawing.Size(190, 28);
this.txtHMaterName.TabIndex = 108;
this.txtHMaterName.Tag = "0";
//
@@ -497,10 +471,9 @@
this.label11.BackColor = System.Drawing.Color.Gray;
this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Yellow;
- this.label11.Location = new System.Drawing.Point(22, 234);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(16, 187);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(112, 27);
+ this.label11.Size = new System.Drawing.Size(90, 21);
this.label11.TabIndex = 107;
this.label11.Text = "浜у搧鍚嶇О锛�";
//
@@ -510,10 +483,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Gray;
this.lblCaption.Font = new System.Drawing.Font("寰蒋闆呴粦", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
- this.lblCaption.Location = new System.Drawing.Point(9, 13);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(7, 10);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(158, 31);
+ this.lblCaption.Size = new System.Drawing.Size(126, 26);
this.lblCaption.TabIndex = 111;
this.lblCaption.Text = "濮斿宸ュ簭鎺ユ敹";
//
@@ -526,10 +498,8 @@
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gbUp.Location = new System.Drawing.Point(0, 0);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1256, 625);
+ this.gbUp.Size = new System.Drawing.Size(942, 500);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
this.gbUp.Enter += new System.EventHandler(this.gbUp_Enter);
@@ -540,9 +510,11 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
- this.groupBox1.Location = new System.Drawing.Point(917, 100);
+ this.groupBox1.Location = new System.Drawing.Point(688, 80);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(335, 521);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Size = new System.Drawing.Size(251, 417);
this.groupBox1.TabIndex = 183;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "鏈緵搴斿晢宸ュ崟";
@@ -551,11 +523,12 @@
//
this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdCardList.Location = new System.Drawing.Point(3, 26);
+ this.grdCardList.Location = new System.Drawing.Point(2, 21);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.grdCardList.Name = "grdCardList";
this.grdCardList.RowHeadersWidth = 51;
this.grdCardList.RowTemplate.Height = 27;
- this.grdCardList.Size = new System.Drawing.Size(329, 492);
+ this.grdCardList.Size = new System.Drawing.Size(247, 394);
this.grdCardList.TabIndex = 150;
//
// tabControl1
@@ -563,10 +536,11 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Left;
- this.tabControl1.Location = new System.Drawing.Point(4, 100);
+ this.tabControl1.Location = new System.Drawing.Point(3, 80);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(913, 521);
+ this.tabControl1.Size = new System.Drawing.Size(685, 417);
this.tabControl1.TabIndex = 168;
//
// tabPage1
@@ -614,10 +588,11 @@
this.tabPage1.Controls.Add(this.txtHStationOutTime);
this.tabPage1.Controls.Add(this.label7);
this.tabPage1.Controls.Add(this.label9);
- this.tabPage1.Location = new System.Drawing.Point(4, 29);
+ this.tabPage1.Location = new System.Drawing.Point(4, 26);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(905, 488);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage1.Size = new System.Drawing.Size(677, 387);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍩烘湰淇℃伅";
//
@@ -626,10 +601,9 @@
this.label32.AutoSize = true;
this.label32.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label32.ForeColor = System.Drawing.Color.Yellow;
- this.label32.Location = new System.Drawing.Point(22, 368);
- this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label32.Location = new System.Drawing.Point(16, 294);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(112, 27);
+ this.label32.Size = new System.Drawing.Size(90, 21);
this.label32.TabIndex = 167;
this.label32.Text = "閫佽揣鍗曞彿锛�";
//
@@ -639,10 +613,9 @@
this.label22.BackColor = System.Drawing.Color.Gray;
this.label22.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.ForeColor = System.Drawing.Color.Yellow;
- this.label22.Location = new System.Drawing.Point(30, 418);
- this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Location = new System.Drawing.Point(22, 334);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(102, 27);
+ this.label22.Size = new System.Drawing.Size(83, 21);
this.label22.TabIndex = 139;
this.label22.Text = "澶� 娉細";
//
@@ -652,10 +625,9 @@
this.label31.BackColor = System.Drawing.Color.Gray;
this.label31.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label31.ForeColor = System.Drawing.Color.Yellow;
- this.label31.Location = new System.Drawing.Point(437, 372);
- this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label31.Location = new System.Drawing.Point(328, 298);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(132, 27);
+ this.label31.Size = new System.Drawing.Size(106, 21);
this.label31.TabIndex = 162;
this.label31.Text = "濮斿宸ュ崟鍙凤細";
//
@@ -664,11 +636,10 @@
this.txtHRemark.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHRemark.ForeColor = System.Drawing.Color.Green;
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(163, 420);
- this.txtHRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHRemark.Location = new System.Drawing.Point(122, 336);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(660, 53);
+ this.txtHRemark.Size = new System.Drawing.Size(496, 43);
this.txtHRemark.TabIndex = 140;
//
// txtHWWWorkOrderBillNo
@@ -676,10 +647,9 @@
this.txtHWWWorkOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWWWorkOrderBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHWWWorkOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(586, 372);
- this.txtHWWWorkOrderBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(440, 298);
this.txtHWWWorkOrderBillNo.Name = "txtHWWWorkOrderBillNo";
- this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(252, 34);
+ this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(190, 28);
this.txtHWWWorkOrderBillNo.TabIndex = 163;
this.txtHWWWorkOrderBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWWWorkOrderBillNo_KeyDown);
//
@@ -689,10 +659,9 @@
this.label28.BackColor = System.Drawing.Color.Gray;
this.label28.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label28.ForeColor = System.Drawing.Color.Yellow;
- this.label28.Location = new System.Drawing.Point(437, 326);
- this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label28.Location = new System.Drawing.Point(328, 261);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(132, 27);
+ this.label28.Size = new System.Drawing.Size(106, 21);
this.label28.TabIndex = 158;
this.label28.Text = "璁㈠崟璺熻釜鍙凤細";
//
@@ -702,10 +671,9 @@
this.label30.BackColor = System.Drawing.Color.Gray;
this.label30.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label30.ForeColor = System.Drawing.Color.Yellow;
- this.label30.Location = new System.Drawing.Point(805, 191);
- this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label30.Location = new System.Drawing.Point(604, 153);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(30, 27);
+ this.label30.Size = new System.Drawing.Size(24, 21);
this.label30.TabIndex = 161;
this.label30.Text = "%";
//
@@ -715,11 +683,10 @@
this.txtHOrderProcNO.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(586, 326);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(440, 261);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(252, 34);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(190, 28);
this.txtHOrderProcNO.TabIndex = 159;
this.txtHOrderProcNO.Tag = "0";
//
@@ -728,10 +695,9 @@
this.txtHPrice.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPrice.ForeColor = System.Drawing.Color.Green;
this.txtHPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPrice.Location = new System.Drawing.Point(586, 238);
- this.txtHPrice.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPrice.Location = new System.Drawing.Point(440, 190);
this.txtHPrice.Name = "txtHPrice";
- this.txtHPrice.Size = new System.Drawing.Size(252, 34);
+ this.txtHPrice.Size = new System.Drawing.Size(190, 28);
this.txtHPrice.TabIndex = 130;
this.txtHPrice.TextChanged += new System.EventHandler(this.txtHPrice_TextChanged);
this.txtHPrice.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHPrice_KeyDown);
@@ -742,10 +708,9 @@
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.ForeColor = System.Drawing.Color.Yellow;
- this.label19.Location = new System.Drawing.Point(454, 281);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Location = new System.Drawing.Point(340, 225);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(112, 27);
+ this.label19.Size = new System.Drawing.Size(90, 21);
this.label19.TabIndex = 131;
this.label19.Text = "鍚◣閲戦锛�";
//
@@ -754,10 +719,9 @@
this.label29.AutoSize = true;
this.label29.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ForeColor = System.Drawing.Color.Yellow;
- this.label29.Location = new System.Drawing.Point(22, 322);
- this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label29.Location = new System.Drawing.Point(16, 258);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(132, 27);
+ this.label29.Size = new System.Drawing.Size(106, 21);
this.label29.TabIndex = 160;
this.label29.Text = "涓嶅悎鏍兼暟閲忥細";
//
@@ -766,10 +730,9 @@
this.txtHMoney.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMoney.ForeColor = System.Drawing.Color.Green;
this.txtHMoney.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMoney.Location = new System.Drawing.Point(586, 281);
- this.txtHMoney.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMoney.Location = new System.Drawing.Point(440, 225);
this.txtHMoney.Name = "txtHMoney";
- this.txtHMoney.Size = new System.Drawing.Size(252, 34);
+ this.txtHMoney.Size = new System.Drawing.Size(190, 28);
this.txtHMoney.TabIndex = 132;
this.txtHMoney.TextChanged += new System.EventHandler(this.txtHMoney_TextChanged);
this.txtHMoney.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMoney_KeyDown);
@@ -780,10 +743,9 @@
this.txtHTaxRate.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHTaxRate.ForeColor = System.Drawing.Color.Green;
this.txtHTaxRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHTaxRate.Location = new System.Drawing.Point(586, 191);
- this.txtHTaxRate.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHTaxRate.Location = new System.Drawing.Point(440, 153);
this.txtHTaxRate.Name = "txtHTaxRate";
- this.txtHTaxRate.Size = new System.Drawing.Size(211, 34);
+ this.txtHTaxRate.Size = new System.Drawing.Size(159, 28);
this.txtHTaxRate.TabIndex = 153;
this.txtHTaxRate.Text = "16";
//
@@ -792,10 +754,9 @@
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.ForeColor = System.Drawing.Color.Yellow;
- this.label18.Location = new System.Drawing.Point(454, 238);
- this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Location = new System.Drawing.Point(340, 190);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(112, 27);
+ this.label18.Size = new System.Drawing.Size(90, 21);
this.label18.TabIndex = 129;
this.label18.Text = "鍚◣鍗曚环锛�";
//
@@ -805,10 +766,9 @@
this.label26.BackColor = System.Drawing.Color.Gray;
this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label26.ForeColor = System.Drawing.Color.Yellow;
- this.label26.Location = new System.Drawing.Point(455, 191);
- this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Location = new System.Drawing.Point(341, 153);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(114, 27);
+ this.label26.Size = new System.Drawing.Size(93, 21);
this.label26.TabIndex = 152;
this.label26.Text = "绋� 鐜囷細";
//
@@ -817,10 +777,9 @@
this.txtHProcNO.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcNO.Location = new System.Drawing.Point(162, 59);
- this.txtHProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHProcNO.Location = new System.Drawing.Point(122, 47);
this.txtHProcNO.Name = "txtHProcNO";
- this.txtHProcNO.Size = new System.Drawing.Size(252, 34);
+ this.txtHProcNO.Size = new System.Drawing.Size(190, 28);
this.txtHProcNO.TabIndex = 157;
this.txtHProcNO.Tag = "0";
this.txtHProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNO_KeyDown);
@@ -829,10 +788,9 @@
//
this.cmbHSupID.BackColor = System.Drawing.Color.Transparent;
this.cmbHSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmbHSupID.Image")));
- this.cmbHSupID.Location = new System.Drawing.Point(798, 147);
- this.cmbHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHSupID.Location = new System.Drawing.Point(598, 118);
this.cmbHSupID.Name = "cmbHSupID";
- this.cmbHSupID.Size = new System.Drawing.Size(40, 40);
+ this.cmbHSupID.Size = new System.Drawing.Size(30, 32);
this.cmbHSupID.TabIndex = 123;
this.cmbHSupID.UseVisualStyleBackColor = false;
this.cmbHSupID.Click += new System.EventHandler(this.cmbHSupID_Click);
@@ -843,10 +801,9 @@
this.label27.BackColor = System.Drawing.Color.Gray;
this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label27.ForeColor = System.Drawing.Color.Yellow;
- this.label27.Location = new System.Drawing.Point(22, 59);
- this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Location = new System.Drawing.Point(16, 47);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(104, 27);
+ this.label27.Size = new System.Drawing.Size(84, 21);
this.label27.TabIndex = 156;
this.label27.Text = "娴� 姘� 鍙凤細";
//
@@ -856,10 +813,9 @@
this.txtHSupID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSupID.ForeColor = System.Drawing.Color.Green;
this.txtHSupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupID.Location = new System.Drawing.Point(586, 147);
- this.txtHSupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSupID.Location = new System.Drawing.Point(440, 118);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(211, 34);
+ this.txtHSupID.Size = new System.Drawing.Size(159, 28);
this.txtHSupID.TabIndex = 122;
this.txtHSupID.Tag = "0";
this.txtHSupID.TextChanged += new System.EventHandler(this.txtHSupID_TextChanged);
@@ -870,10 +826,9 @@
this.txtHInnerBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHInnerBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(162, 368);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(122, 294);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(252, 34);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(190, 28);
this.txtHInnerBillNo.TabIndex = 151;
//
// label14
@@ -882,10 +837,9 @@
this.label14.BackColor = System.Drawing.Color.Gray;
this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Yellow;
- this.label14.Location = new System.Drawing.Point(464, 147);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(348, 118);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(104, 27);
+ this.label14.Size = new System.Drawing.Size(84, 21);
this.label14.TabIndex = 121;
this.label14.Text = "渚� 搴� 鍟嗭細";
//
@@ -894,10 +848,9 @@
this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQty.ForeColor = System.Drawing.Color.Green;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(586, 103);
- this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHQty.Location = new System.Drawing.Point(440, 82);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(252, 34);
+ this.txtHQty.Size = new System.Drawing.Size(190, 28);
this.txtHQty.TabIndex = 118;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -910,10 +863,9 @@
this.label12.BackColor = System.Drawing.Color.Gray;
this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Yellow;
- this.label12.Location = new System.Drawing.Point(464, 15);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(348, 12);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(104, 27);
+ this.label12.Size = new System.Drawing.Size(84, 21);
this.label12.TabIndex = 116;
this.label12.Text = "鍗� 鎹� 鍙凤細";
//
@@ -922,10 +874,9 @@
this.txtHWasterQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWasterQty.ForeColor = System.Drawing.Color.Green;
this.txtHWasterQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWasterQty.Location = new System.Drawing.Point(162, 322);
- this.txtHWasterQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWasterQty.Location = new System.Drawing.Point(122, 258);
this.txtHWasterQty.Name = "txtHWasterQty";
- this.txtHWasterQty.Size = new System.Drawing.Size(252, 34);
+ this.txtHWasterQty.Size = new System.Drawing.Size(190, 28);
this.txtHWasterQty.TabIndex = 134;
this.txtHWasterQty.Tag = "0";
this.txtHWasterQty.TextChanged += new System.EventHandler(this.txtHWasterQty_TextChanged);
@@ -938,11 +889,10 @@
this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(586, 15);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(440, 12);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(252, 34);
+ this.txtHBillNo.Size = new System.Drawing.Size(190, 28);
this.txtHBillNo.TabIndex = 117;
//
// txtHStationOutTime
@@ -951,11 +901,10 @@
this.txtHStationOutTime.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHStationOutTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationOutTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHStationOutTime.Location = new System.Drawing.Point(586, 59);
- this.txtHStationOutTime.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHStationOutTime.Location = new System.Drawing.Point(440, 47);
this.txtHStationOutTime.Name = "txtHStationOutTime";
this.txtHStationOutTime.ReadOnly = true;
- this.txtHStationOutTime.Size = new System.Drawing.Size(252, 34);
+ this.txtHStationOutTime.Size = new System.Drawing.Size(190, 28);
this.txtHStationOutTime.TabIndex = 112;
this.txtHStationOutTime.Tag = "0";
//
@@ -988,10 +937,11 @@
this.tabPage2.Controls.Add(this.label6);
this.tabPage2.Controls.Add(this.cmdHGroupID);
this.tabPage2.Controls.Add(this.cmdHSourceID);
- this.tabPage2.Location = new System.Drawing.Point(4, 29);
+ this.tabPage2.Location = new System.Drawing.Point(4, 26);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(905, 488);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage2.Size = new System.Drawing.Size(677, 387);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍏朵粬淇℃伅";
//
@@ -1001,10 +951,9 @@
this.txtHPrice_BHS.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPrice_BHS.ForeColor = System.Drawing.Color.Green;
this.txtHPrice_BHS.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPrice_BHS.Location = new System.Drawing.Point(164, 157);
- this.txtHPrice_BHS.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPrice_BHS.Location = new System.Drawing.Point(123, 126);
this.txtHPrice_BHS.Name = "txtHPrice_BHS";
- this.txtHPrice_BHS.Size = new System.Drawing.Size(249, 38);
+ this.txtHPrice_BHS.Size = new System.Drawing.Size(188, 32);
this.txtHPrice_BHS.TabIndex = 153;
//
// txtHSendBillNo
@@ -1012,10 +961,9 @@
this.txtHSendBillNo.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSendBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHSendBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSendBillNo.Location = new System.Drawing.Point(164, 276);
- this.txtHSendBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSendBillNo.Location = new System.Drawing.Point(123, 221);
this.txtHSendBillNo.Name = "txtHSendBillNo";
- this.txtHSendBillNo.Size = new System.Drawing.Size(207, 38);
+ this.txtHSendBillNo.Size = new System.Drawing.Size(156, 32);
this.txtHSendBillNo.TabIndex = 166;
this.txtHSendBillNo.Tag = "0";
//
@@ -1024,10 +972,9 @@
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.ForeColor = System.Drawing.Color.Yellow;
- this.label25.Location = new System.Drawing.Point(18, 193);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Location = new System.Drawing.Point(14, 154);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(132, 27);
+ this.label25.Size = new System.Drawing.Size(106, 21);
this.label25.TabIndex = 152;
this.label25.Text = "涓嶅惈绋庡崟浠凤細";
//
@@ -1037,10 +984,9 @@
this.txtHMoney_BHS.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMoney_BHS.ForeColor = System.Drawing.Color.Green;
this.txtHMoney_BHS.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMoney_BHS.Location = new System.Drawing.Point(164, 196);
- this.txtHMoney_BHS.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMoney_BHS.Location = new System.Drawing.Point(123, 157);
this.txtHMoney_BHS.Name = "txtHMoney_BHS";
- this.txtHMoney_BHS.Size = new System.Drawing.Size(249, 38);
+ this.txtHMoney_BHS.Size = new System.Drawing.Size(188, 32);
this.txtHMoney_BHS.TabIndex = 155;
//
// label24
@@ -1048,10 +994,9 @@
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.ForeColor = System.Drawing.Color.Yellow;
- this.label24.Location = new System.Drawing.Point(18, 232);
- this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Location = new System.Drawing.Point(14, 186);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(132, 27);
+ this.label24.Size = new System.Drawing.Size(106, 21);
this.label24.TabIndex = 154;
this.label24.Text = "涓嶅惈绋庨噾棰濓細";
//
@@ -1060,10 +1005,9 @@
this.txtHBadPNL.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBadPNL.ForeColor = System.Drawing.Color.Green;
this.txtHBadPNL.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadPNL.Location = new System.Drawing.Point(164, 117);
- this.txtHBadPNL.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBadPNL.Location = new System.Drawing.Point(123, 94);
this.txtHBadPNL.Name = "txtHBadPNL";
- this.txtHBadPNL.Size = new System.Drawing.Size(249, 38);
+ this.txtHBadPNL.Size = new System.Drawing.Size(188, 32);
this.txtHBadPNL.TabIndex = 138;
this.txtHBadPNL.Tag = "0";
this.txtHBadPNL.TextChanged += new System.EventHandler(this.txtHBadPNL_TextChanged);
@@ -1076,10 +1020,9 @@
this.label23.BackColor = System.Drawing.Color.Gray;
this.label23.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.ForeColor = System.Drawing.Color.Yellow;
- this.label23.Location = new System.Drawing.Point(18, 154);
- this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Location = new System.Drawing.Point(14, 123);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(112, 27);
+ this.label23.Size = new System.Drawing.Size(90, 21);
this.label23.TabIndex = 150;
this.label23.Text = "閫佽揣鍗曞彿锛�";
//
@@ -1088,11 +1031,10 @@
this.txtHPlanPieceQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanPieceQty.Location = new System.Drawing.Point(164, 37);
- this.txtHPlanPieceQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPlanPieceQty.Location = new System.Drawing.Point(123, 30);
this.txtHPlanPieceQty.Name = "txtHPlanPieceQty";
this.txtHPlanPieceQty.ReadOnly = true;
- this.txtHPlanPieceQty.Size = new System.Drawing.Size(249, 38);
+ this.txtHPlanPieceQty.Size = new System.Drawing.Size(188, 32);
this.txtHPlanPieceQty.TabIndex = 136;
this.txtHPlanPieceQty.Tag = "0";
//
@@ -1102,10 +1044,9 @@
this.label21.BackColor = System.Drawing.Color.Gray;
this.label21.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.Color.Yellow;
- this.label21.Location = new System.Drawing.Point(18, 115);
- this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Location = new System.Drawing.Point(14, 92);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(112, 27);
+ this.label21.Size = new System.Drawing.Size(90, 21);
this.label21.TabIndex = 137;
this.label21.Text = "鎶ュ簾浠舵暟锛�";
//
@@ -1115,10 +1056,9 @@
this.label13.BackColor = System.Drawing.Color.Gray;
this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Yellow;
- this.label13.Location = new System.Drawing.Point(18, 76);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(14, 61);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(132, 27);
+ this.label13.Size = new System.Drawing.Size(106, 21);
this.label13.TabIndex = 119;
this.label13.Text = "浠诲姟鍗曟暟閲忥細";
//
@@ -1127,10 +1067,9 @@
this.txtHPieceQty.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPieceQty.Location = new System.Drawing.Point(559, 81);
- this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHPieceQty.Location = new System.Drawing.Point(419, 65);
this.txtHPieceQty.Name = "txtHPieceQty";
- this.txtHPieceQty.Size = new System.Drawing.Size(284, 38);
+ this.txtHPieceQty.Size = new System.Drawing.Size(214, 32);
this.txtHPieceQty.TabIndex = 126;
this.txtHPieceQty.Tag = "0";
this.txtHPieceQty.TextChanged += new System.EventHandler(this.txtHPieceQty_TextChanged);
@@ -1143,10 +1082,9 @@
this.label17.BackColor = System.Drawing.Color.Gray;
this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ForeColor = System.Drawing.Color.Yellow;
- this.label17.Location = new System.Drawing.Point(444, 129);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(333, 103);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(112, 27);
+ this.label17.Size = new System.Drawing.Size(90, 21);
this.label17.TabIndex = 125;
this.label17.Text = "鎺ユ敹浠舵暟锛�";
//
@@ -1156,10 +1094,9 @@
this.label15.BackColor = System.Drawing.Color.Gray;
this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.ForeColor = System.Drawing.Color.Yellow;
- this.label15.Location = new System.Drawing.Point(444, 39);
- this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Location = new System.Drawing.Point(333, 31);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(112, 27);
+ this.label15.Size = new System.Drawing.Size(90, 21);
this.label15.TabIndex = 133;
this.label15.Text = "鎶ュ簾涓暟锛�";
//
@@ -1169,10 +1106,9 @@
this.label20.BackColor = System.Drawing.Color.Gray;
this.label20.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.ForeColor = System.Drawing.Color.Yellow;
- this.label20.Location = new System.Drawing.Point(18, 37);
- this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Location = new System.Drawing.Point(14, 30);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(112, 27);
+ this.label20.Size = new System.Drawing.Size(90, 21);
this.label20.TabIndex = 135;
this.label20.Text = "鍙戝嚭浠舵暟锛�";
//
@@ -1182,9 +1118,10 @@
this.panel3.Controls.Add(this.label33);
this.panel3.Controls.Add(this.lblCaption);
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel3.Location = new System.Drawing.Point(4, 24);
+ this.panel3.Location = new System.Drawing.Point(3, 19);
+ this.panel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(1248, 76);
+ this.panel3.Size = new System.Drawing.Size(936, 61);
this.panel3.TabIndex = 169;
//
// txtHBarCode
@@ -1192,11 +1129,10 @@
this.txtHBarCode.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(309, 14);
- this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBarCode.Location = new System.Drawing.Point(232, 11);
this.txtHBarCode.Multiline = true;
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(304, 40);
+ this.txtHBarCode.Size = new System.Drawing.Size(229, 33);
this.txtHBarCode.TabIndex = 117;
this.txtHBarCode.Tag = "0";
this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
@@ -1207,10 +1143,9 @@
this.label33.BackColor = System.Drawing.Color.Gray;
this.label33.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label33.ForeColor = System.Drawing.Color.Yellow;
- this.label33.Location = new System.Drawing.Point(209, 18);
- this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label33.Location = new System.Drawing.Point(157, 14);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(92, 27);
+ this.label33.Size = new System.Drawing.Size(74, 21);
this.label33.TabIndex = 116;
this.label33.Text = "鏉″舰鐮侊細";
//
@@ -1220,14 +1155,13 @@
this.grdSum.AllowUserToDeleteRows = false;
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSum.Location = new System.Drawing.Point(1015, 18);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(761, 14);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(126, 24);
+ this.grdSum.Size = new System.Drawing.Size(94, 19);
this.grdSum.TabIndex = 165;
this.grdSum.Visible = false;
//
@@ -1239,22 +1173,20 @@
this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(1040, 18);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(780, 14);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(101, 53);
+ this.grdMain.Size = new System.Drawing.Size(76, 42);
this.grdMain.TabIndex = 164;
this.grdMain.Visible = false;
//
// cmdBF
//
- this.cmdBF.Location = new System.Drawing.Point(1247, 16);
- this.cmdBF.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdBF.Location = new System.Drawing.Point(935, 13);
this.cmdBF.Name = "cmdBF";
- this.cmdBF.Size = new System.Drawing.Size(90, 52);
+ this.cmdBF.Size = new System.Drawing.Size(68, 42);
this.cmdBF.TabIndex = 119;
this.cmdBF.Text = "鎶� 搴�";
this.cmdBF.UseVisualStyleBackColor = true;
@@ -1263,10 +1195,9 @@
//
// cmdAddNew
//
- this.cmdAddNew.Location = new System.Drawing.Point(1149, 16);
- this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdAddNew.Location = new System.Drawing.Point(862, 13);
this.cmdAddNew.Name = "cmdAddNew";
- this.cmdAddNew.Size = new System.Drawing.Size(90, 52);
+ this.cmdAddNew.Size = new System.Drawing.Size(68, 42);
this.cmdAddNew.TabIndex = 115;
this.cmdAddNew.Text = "娓� 绌�";
this.cmdAddNew.UseVisualStyleBackColor = true;
@@ -1280,6 +1211,7 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.cmdXZ);
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.grdSum);
@@ -1292,17 +1224,17 @@
this.panel1.Controls.Add(this.cmdAddNew);
this.panel1.Controls.Add(this.cmdOK);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 625);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(0, 500);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1256, 81);
+ this.panel1.Size = new System.Drawing.Size(942, 65);
this.panel1.TabIndex = 116;
//
// button3
//
- this.button3.Location = new System.Drawing.Point(857, 18);
+ this.button3.Location = new System.Drawing.Point(641, 10);
+ this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(98, 49);
+ this.button3.Size = new System.Drawing.Size(70, 42);
this.button3.TabIndex = 151;
this.button3.Text = "鎵撳嵃";
this.button3.UseVisualStyleBackColor = true;
@@ -1312,10 +1244,9 @@
// button2
//
this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(725, 15);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Location = new System.Drawing.Point(552, 10);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(102, 52);
+ this.button2.Size = new System.Drawing.Size(70, 42);
this.button2.TabIndex = 148;
this.button2.Text = "鍙嶅鏍�";
this.button2.UseVisualStyleBackColor = true;
@@ -1324,10 +1255,9 @@
// button1
//
this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(596, 15);
- this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Location = new System.Drawing.Point(463, 10);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(102, 52);
+ this.button1.Size = new System.Drawing.Size(70, 42);
this.button1.TabIndex = 147;
this.button1.Text = "瀹� 鏍�";
this.button1.UseVisualStyleBackColor = true;
@@ -1335,10 +1265,9 @@
//
// cmdDelBill
//
- this.cmdDelBill.Location = new System.Drawing.Point(149, 15);
- this.cmdDelBill.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdDelBill.Location = new System.Drawing.Point(196, 10);
this.cmdDelBill.Name = "cmdDelBill";
- this.cmdDelBill.Size = new System.Drawing.Size(99, 50);
+ this.cmdDelBill.Size = new System.Drawing.Size(70, 42);
this.cmdDelBill.TabIndex = 146;
this.cmdDelBill.Text = "鍒犻櫎鍏ュ簱鍗�";
this.cmdDelBill.UseVisualStyleBackColor = true;
@@ -1347,10 +1276,9 @@
//
// cmdXG
//
- this.cmdXG.Location = new System.Drawing.Point(19, 13);
- this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdXG.Location = new System.Drawing.Point(107, 10);
this.cmdXG.Name = "cmdXG";
- this.cmdXG.Size = new System.Drawing.Size(98, 52);
+ this.cmdXG.Size = new System.Drawing.Size(70, 42);
this.cmdXG.TabIndex = 121;
this.cmdXG.Text = "淇� 鏀�";
this.cmdXG.UseVisualStyleBackColor = true;
@@ -1358,10 +1286,9 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(454, 15);
- this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdCancel.Location = new System.Drawing.Point(374, 10);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(100, 52);
+ this.cmdCancel.Size = new System.Drawing.Size(70, 42);
this.cmdCancel.TabIndex = 110;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -1369,10 +1296,9 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(313, 14);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdOK.Location = new System.Drawing.Point(285, 10);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(103, 52);
+ this.cmdOK.Size = new System.Drawing.Size(70, 42);
this.cmdOK.TabIndex = 109;
this.cmdOK.Text = "鎺� 鏀�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -1383,21 +1309,29 @@
this.panel2.Controls.Add(this.gbUp);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1256, 625);
+ this.panel2.Size = new System.Drawing.Size(942, 500);
this.panel2.TabIndex = 117;
+ //
+ // cmdXZ
+ //
+ this.cmdXZ.Location = new System.Drawing.Point(18, 10);
+ this.cmdXZ.Name = "cmdXZ";
+ this.cmdXZ.Size = new System.Drawing.Size(70, 42);
+ this.cmdXZ.TabIndex = 166;
+ this.cmdXZ.Text = "鏂� 澧�";
+ this.cmdXZ.UseVisualStyleBackColor = true;
+ this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
//
// MES_StationEntrustOutBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Gray;
- this.ClientSize = new System.Drawing.Size(1256, 706);
+ this.ClientSize = new System.Drawing.Size(942, 565);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustOutBill";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "濮斿宸ュ簭鎺ユ敹";
@@ -1517,5 +1451,6 @@
private System.Windows.Forms.DataGridView grdCardList;
private System.Windows.Forms.TextBox txtHBarCode;
private System.Windows.Forms.Label label33;
+ private System.Windows.Forms.Button cmdXZ;
}
}
\ No newline at end of file
--
Gitblit v1.9.1