From 681c617b48ddbc556fdbe6a251161a3b9584adab Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 21:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 192 --
LMES/ClsShowMod.cs | 13
WarM/报表分析/Kf_ICInventory_BarCode.designer.cs | 220 --
WarM/报表分析/Kf_ICInventory_BarCode.cs | 768 ++-------
WebAPI/Models/ClsSb_EquipRepairSendWorkBillMain.cs | 23
WebAPI/WebAPI.csproj.user | 2
WebAPI/Models/ClsSc_ProcessPlanMain.cs | 38
WebAPI/Controllers/LMESController.cs | 17
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs | 35
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 18
WebAPI/DLL/ClsSc_ProcessPlan.cs | 291 +++
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.Designer.cs | 113
WarM/报表分析/WMS_BarCodeStatusQueryReport.cs | 2
WebAPI/Models/ClsSb_EquipRepairSendWorkBillSub.cs | 16
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 225 ++
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.cs | 266 +-
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 111
WarM/报表分析/Kf_BarCodeOutInReport.designer.cs | 484 +++--
WebAPI/Models/ClsSc_ProcessPlanSub.cs | 45
WarM/报表分析/Kf_BarCodeOutInReport.resx | 28
WebAPI/DLL/ClsSb_EquipRepairSendWorkBill.cs | 229 +++
WebAPI/Controllers/Sc_PckSplitBillController.cs | 250 +++
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 33
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 189 +
WarM/报表分析/Kf_ICInventory_BarCode.resx | 116 -
WebAPI/Controllers/Sc_ProcessMangementController.cs | 424 +++++
WarM/报表分析/Kf_BarCodeOutInReport.cs | 289 ++-
WebAPI/WebAPI.csproj | 7
28 files changed, 2,768 insertions(+), 1,676 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 7cfba28..04aa2dd 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3879,6 +3879,13 @@
oKf_MateOutRequestBill.ShowDialog();
break;
//===================================报表分析
+ case "kf_icinventory_barcode":
+ Kf_ICInventory_BarCode oKf_ICInventory_BarCode = new Kf_ICInventory_BarCode();
+ oKf_ICInventory_BarCode.MdiParent = oMain;
+ oKf_ICInventory_BarCode.ModCaption = gnmc;
+ oKf_ICInventory_BarCode.Show();
+ oMainForm.AddTabPage(oKf_ICInventory_BarCode);
+ break;
case "wms_barcodestatusqueryreport":
WMS_BarCodeStatusQueryReport oWMS_BarCodeStatusQueryReport = new WMS_BarCodeStatusQueryReport();
oWMS_BarCodeStatusQueryReport.MdiParent = oMain;
@@ -3948,6 +3955,12 @@
oSc_PackUnionBill.ModCaption = gnmc;
oSc_PackUnionBill.ShowDialog();
break;
+ case "gy_barcodebill_chaima":
+ WarM.仓库管理.Gy_BarCodeBill_ChaiMa oGy_BarCodeBill_ChaiMa = new WarM.仓库管理.Gy_BarCodeBill_ChaiMa();
+ oGy_BarCodeBill_ChaiMa.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //oGy_BarCodeBill_ChaiMa.ModCaption = gnmc;
+ oGy_BarCodeBill_ChaiMa.ShowDialog();
+ break;
default:
break;
}
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
index 0a204ed..e925a68 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
@@ -42,6 +42,12 @@
this.cmdSourceBillNo = new System.Windows.Forms.Button();
this.P1 = new System.Windows.Forms.Panel();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtNum = new System.Windows.Forms.TextBox();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.dy = new System.Windows.Forms.ToolStripButton();
this.tc = new System.Windows.Forms.ToolStripButton();
@@ -52,12 +58,6 @@
this.xz = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.grdPrint = new System.Windows.Forms.DataGridView();
- this.txtHBillNo = new System.Windows.Forms.TextBox();
- this.txtNum = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.button1 = new System.Windows.Forms.Button();
- this.label3 = new System.Windows.Forms.Label();
- this.txtHMaker = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -232,6 +232,56 @@
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
+ // txtHMaker
+ //
+ this.txtHMaker.Location = new System.Drawing.Point(867, 29);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.ReadOnly = true;
+ this.txtHMaker.Size = new System.Drawing.Size(182, 25);
+ this.txtHMaker.TabIndex = 25;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(794, 33);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.TabIndex = 24;
+ this.label3.Text = "鍒跺崟浜猴細";
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(656, 25);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(84, 31);
+ this.button1.TabIndex = 23;
+ this.button1.Text = "纭� 瀹�";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(357, 32);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.TabIndex = 22;
+ this.label1.Text = "鎷嗗垎鏉℃暟锛�";
+ //
+ // txtNum
+ //
+ this.txtNum.Location = new System.Drawing.Point(442, 29);
+ this.txtNum.Name = "txtNum";
+ this.txtNum.Size = new System.Drawing.Size(186, 25);
+ this.txtNum.TabIndex = 21;
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Location = new System.Drawing.Point(146, 29);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(181, 25);
+ this.txtHBillNo.TabIndex = 20;
+ //
// toolStripSeparator12
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -263,6 +313,7 @@
this.tc.Text = "閫�鍑�";
this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
//
// yl
//
@@ -338,56 +389,6 @@
this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 53;
this.grdPrint.Visible = false;
- //
- // txtHBillNo
- //
- this.txtHBillNo.Location = new System.Drawing.Point(146, 29);
- this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(181, 25);
- this.txtHBillNo.TabIndex = 20;
- //
- // txtNum
- //
- this.txtNum.Location = new System.Drawing.Point(442, 29);
- this.txtNum.Name = "txtNum";
- this.txtNum.Size = new System.Drawing.Size(186, 25);
- this.txtNum.TabIndex = 21;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(357, 32);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
- this.label1.TabIndex = 22;
- this.label1.Text = "鎷嗗垎鏉℃暟锛�";
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(656, 25);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(84, 31);
- this.button1.TabIndex = 23;
- this.button1.Text = "纭� 瀹�";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(794, 33);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
- this.label3.TabIndex = 24;
- this.label3.Text = "鍒跺崟浜猴細";
- //
- // txtHMaker
- //
- this.txtHMaker.Location = new System.Drawing.Point(867, 29);
- this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.ReadOnly = true;
- this.txtHMaker.Size = new System.Drawing.Size(182, 25);
- this.txtHMaker.TabIndex = 25;
//
// Gy_BarCodeBill_ChaiMa
//
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
index 2cd9c33..7251f41 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
@@ -43,6 +43,7 @@
public const string ModName = ""; //鍗曟嵁绫诲瀷
public const string ModCaption = "鏉＄爜鎷嗙爜"; //鍗曟嵁鍚嶇О
public const string ModRightName = "Gy_BarCodeBill_ChaiMa";
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus; //鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
ClsGridViewSum oSumGrid_Mater = new ClsGridViewSum();
ClsGridViewSum oSumGrid_Pay = new ClsGridViewSum();
public DAL.ClsGy_BarCodeBill_ChaiMa BillNew = new DAL.ClsGy_BarCodeBill_ChaiMa(); //瀵瑰簲鍗曟嵁绫�
@@ -56,6 +57,8 @@
txtHMaker.Text = DBUtility.ClsPub.CurUserName;
initGrid();
initGrid_Pay();
+ oSumGrid_Mater.NoCol = HSnoCol;
+ oSumGrid_Pay.NoCol = HSnoCol2;
}
#region 绐椾綋澶勭悊鏂规硶
@@ -63,7 +66,7 @@
//鍒濆鍖栭〉绛�1
private void initGrid()
{
- grdMain.ColumnCount = 9; //鎬诲垪鏁�
+ grdMain.ColumnCount = 10; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name + "1");
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HInterID].HeaderText = "HInterID";
@@ -84,33 +87,33 @@
//璁剧疆鍚堣鍒�
string sTotalCol = HTagCol.ToString() + "0";
//鏍煎紡鍖栫綉鏍�
- DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Mater);
+ //DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Mater);
}
//鍒濆鍖栭〉绛�2
private void initGrid_Pay()
{
- grdMain.ColumnCount = 9; //鎬诲垪鏁�
- DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name + "1");
- grdMain.Columns[HSnoCol2].HeaderText = "搴忓彿";
- grdMain.Columns[HInterID2].HeaderText = "HInterID";
- grdMain.Columns[HBarCode2].HeaderText = "鏉＄爜缂栧彿";
- grdMain.Columns[HQty2].HeaderText = "鏉＄爜鏁伴噺";
- grdMain.Columns[HNum2].HeaderText = "鎷嗗垎鏁伴噺";
- grdMain.Columns[HMaterCol2].HeaderText = "鐗╂枡浠ｇ爜";
- grdMain.Columns[HMaterName2].HeaderText = "鐗╂枡鍚嶇О";
- grdMain.Columns[HMaterMould2].HeaderText = "瑙勬牸鍨嬪彿";
- grdMain.Columns[HBatchNo2].HeaderText = "鎵瑰彿";
+ grdMain_Pay.ColumnCount = 10; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain_Pay, this.Name + "1");
+ grdMain_Pay.Columns[HSnoCol2].HeaderText = "搴忓彿";
+ grdMain_Pay.Columns[HInterID2].HeaderText = "HInterID";
+ grdMain_Pay.Columns[HBarCode2].HeaderText = "鏉＄爜缂栧彿";
+ grdMain_Pay.Columns[HQty2].HeaderText = "鏉＄爜鏁伴噺";
+ grdMain_Pay.Columns[HNum2].HeaderText = "鎷嗗垎鏁伴噺";
+ grdMain_Pay.Columns[HMaterCol2].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain_Pay.Columns[HMaterName2].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain_Pay.Columns[HMaterMould2].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain_Pay.Columns[HBatchNo2].HeaderText = "鎵瑰彿";
//=============================================================================
////闅愯棌鍒�
- grdMain.Columns[HTagCol].Visible = false;
- grdMain.Columns[HInterID].Visible = false;
+ grdMain_Pay.Columns[HTagCol].Visible = false;
+ grdMain_Pay.Columns[HInterID].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HNum2.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HTagCol2.ToString() + "0";
//鏍煎紡鍖栫綉鏍�
- DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Pay);
+ //DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid_Pay);
}
// 鍩烘湰涓嶅彉
@@ -128,141 +131,157 @@
txtHBillNo.Text = "";
txtNum.Text = "";
txtHMaker.Text = DBUtility.ClsPub.CurUserName;
+ Sub_ClearBill();
}
//鏁版嵁楠岃瘉
private bool Sub_AllowSave()
{
- int i = 0;
- while (grdMain_Pay.Rows[i].Cells[HSnoCol].Value.ToString() != "")
+ for (int i = 0; i <= grdMain_Pay.RowCount - 1; i++)
{
- if (grdMain_Pay.Rows[i].Cells[HNum2].Value.ToString() == "")
+ if (ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HSnoCol2].Value) != 0)
{
- MessageBox.Show("璇峰皢琛ㄦ牸鎷嗗垎鏁伴噺濉啓瀹屾暣", "鎻愮ず");
+ if (ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HNum2].Value) ==null)
+ {
+ MessageBox.Show("璇峰皢琛ㄦ牸鎷嗗垎鏁伴噺濉啓瀹屾暣", "鎻愮ず");
+ return false;
+ }
+ }
+ else
+ {
return false;
}
}
return true;
+ }
+
+ //鐢熸垚鎸夐挳
+ private void xz_Click(object sender, EventArgs e)
+ {
+ this.SeverDate();
}
private bool SeverDate()
{
Int32 i;
bool bResult;
BillNew = new DAL.ClsGy_BarCodeBill_ChaiMa();
-
- if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
- return false;
-
- //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
- string s = "";
- int sYear = 0;
- int sPeriod = 0;
- string HBillNo = txtHBillNo.Text;
- DataSet Ds;
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where HBarCode='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
-
- for (i = 0; i <= grdMain_Pay.RowCount - 1; i++)
- {
- if (ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HBarCode].Value) != 0)
+ //if (Sub_AllowSave())
+ //{
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string HBillNo = txtHBillNo.Text;
+ DataSet Ds;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where 鏉＄爜缂栧彿='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
+ for (i = 0; i <= grdMain_Pay.RowCount - 1; i++)
{
-
- Model.ClsGy_BarCodeEdit_Model model = new Model.ClsGy_BarCodeEdit_Model();
- //鍥哄畾璧嬪��========================================
- model.HEntryID = i + 1;
- model.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
- model.HBarCode = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBarCode].Value);
- model.HQty = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HQty].Value);
- model.HPieceQty = DBUtility.ClsPub.isInt(grdMain_Pay.Rows[i].Cells[HNum2].Value);
- model.HBatchNo = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBatchNo].Value);
- model.HMaterID = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HMaterCol].Value);
- model.HUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HUnitID"].ToString());
- model.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"].ToString());
- model.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"].ToString());
- model.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"].ToString());
- model.HBarCodeType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCodeType"].ToString());
- model.HItemSubID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemSubID"].ToString());
- model.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"].ToString());
- model.HSourceInterID= DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
- model.HSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceEntryID"].ToString());
- model.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"].ToString());
- model.HSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillType"].ToString());
- model.HUseFlag = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUseFlag"].ToString());
- model.HStopflag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HStopflag"].ToString());
- model.HInitQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
- model.HSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
- model.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"].ToString());
- model.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"].ToString());
- model.HOWNERID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOWNERID"].ToString());
- model.HBarCodeDate= DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HBarCodeDate"].ToString());
- model.HInnerBillNo= DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString());
- model.HMZ= DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMZ"].ToString());
-
- model.HMakeDate = DateTime.Now;
- model.HMaker = ClsPub.CurUserName;
-
- if (model.HPieceQty <= 0|| model.HPieceQty.ToString() =="")
+ if (ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HSnoCol2].Value) != 0)
{
- MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝鎷嗗垎鏁伴噺蹇呴』澶т簬0锛�");
- return false;
+
+ Model.ClsGy_BarCodeEdit_Model model = new Model.ClsGy_BarCodeEdit_Model();
+ //鍥哄畾璧嬪��========================================
+ model.HEntryID = i + 1;
+ model.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
+ model.HBarCode = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBarCode].Value);
+ model.HQty = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HNum2].Value);
+ model.HQty = DBUtility.ClsPub.isInt(grdMain_Pay.Rows[i].Cells[HNum2].Value);
+ model.HBatchNo = DBUtility.ClsPub.isStrNull(grdMain_Pay.Rows[i].Cells[HBatchNo].Value);
+ model.HMaterID = DBUtility.ClsPub.isLong(grdMain_Pay.Rows[i].Cells[HMaterCol].Value);
+ model.HUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HUnitID"].ToString());
+ model.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"].ToString());
+ model.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"].ToString());
+ model.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"].ToString());
+ model.HBarCodeType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCodeType"].ToString());
+ model.HItemSubID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemSubID"].ToString());
+ model.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"].ToString());
+ model.HSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
+ model.HSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceEntryID"].ToString());
+ model.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"].ToString());
+ model.HSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillType"].ToString());
+ model.HUseFlag = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUseFlag"].ToString());
+ model.HStopflag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HStopflag"].ToString());
+ model.HInitQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
+ model.HSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInitQty"].ToString());
+ model.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"].ToString());
+ model.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"].ToString());
+ model.HOWNERID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOWNERID"].ToString());
+ model.HBarCodeDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HBarCodeDate"].ToString());
+ model.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString());
+ model.HMZ = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMZ"].ToString());
+
+ model.HMakeDate = DateTime.Now;
+ model.HMaker = ClsPub.CurUserName;
+
+ if (model.HPieceQty <= 0 || model.HPieceQty.ToString() == "")
+ {
+ MessageBox.Show("绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝鎷嗗垎鏁伴噺蹇呴』澶т簬0锛�");
+ return false;
+ }
+ BillNew.DetailColl_Mater.Add(model);
}
- BillNew.DetailColl_Mater.Add(model);
}
- }
- return true;
- //淇濆瓨
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- //鎻愮ず
- if (bResult == true)
- {
- MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
- return true;
- }
- else
- {
- MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
- return false;
- }
- }
- //鐢熸垚鎸夐挳
- private void xz_Click(object sender, EventArgs e)
- {
- this.SeverDate();
+
+ //淇濆瓨
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ MessageBox.Show("鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + this.txtHBillNo.Text.Trim(), "鎻愮ず");
+ return true;
+ }
+ else
+ {
+ MessageBox.Show("淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ return false;
+ }
+ //}
+ //else
+ //{
+ // return false;
+ //}
}
//纭畾鎸夐挳
private void button1_Click(object sender, EventArgs e)
{
- if (DBUtility.ClsPub.isStrNull(txtHBillNo.Text) != ""|| DBUtility.ClsPub.isStrNull(txtNum.Text) != "")
+ if (DBUtility.ClsPub.isStrNull(txtHBillNo.Text) != ""&& DBUtility.ClsPub.isStrNull(txtNum.Text) != "")
{
string HBillNo = txtHBillNo.Text;
- int HNum = int.Parse(txtNum.Text);
+ int HNumCan = int.Parse(txtNum.Text);
DataSet Ds;
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where HBarCode='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
- grdMain.Rows[0].Cells[HTagCol].Value = "*";
- grdMain.Rows[0].Cells[HInterID].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
- grdMain.Rows[0].Cells[HBarCode].Value = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
- grdMain.Rows[0].Cells[HQty].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
- grdMain.Rows[0].Cells[HNum].Value = 0;
- grdMain.Rows[0].Cells[HMaterCol].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
- grdMain.Rows[0].Cells[HMaterName].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
- grdMain.Rows[0].Cells[HMaterMould].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
- grdMain.Rows[0].Cells[HBatchNo].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
- for (int i = 0; i < HNum; i++)
+ Ds = oCn.RunProcReturn("select top 1* from h_v_Gy_BarCodeBill_ChaiMa where 鏉＄爜缂栧彿='" + HBillNo + "'", "h_v_Gy_BarCodeBill_ChaiMa");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
- int Code = 65 + i;
- System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
- byte[] byteArray = new byte[] { (byte)Code };
- string A = asciiEncoding.GetString(byteArray);
- string No = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
- grdMain_Pay.Rows[i].Cells[HTagCol2].Value = "*";
- grdMain_Pay.Rows[0].Cells[HInterID2].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
- grdMain_Pay.Rows[0].Cells[HBarCode2].Value = No + A;
- grdMain_Pay.Rows[0].Cells[HQty2].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
- grdMain_Pay.Rows[0].Cells[HMaterCol2].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
- grdMain_Pay.Rows[0].Cells[HMaterName2].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
- grdMain_Pay.Rows[0].Cells[HMaterMould2].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
- grdMain_Pay.Rows[0].Cells[HBatchNo2].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
+ MessageBox.Show("鏉＄爜缂栧彿涓嶅瓨鍦�", "鎻愮ず");
+ }
+ else
+ {
+ grdMain.Rows[0].Cells[HTagCol].Value = "*";
+ grdMain.Rows[0].Cells[HSnoCol].Value = 1;
+ grdMain.Rows[0].Cells[HInterID].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
+ grdMain.Rows[0].Cells[HBarCode].Value = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
+ grdMain.Rows[0].Cells[HQty].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
+ grdMain.Rows[0].Cells[HNum].Value = 0;
+ grdMain.Rows[0].Cells[HMaterCol].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[0].Cells[HMaterName].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[0].Cells[HMaterMould].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[0].Cells[HBatchNo].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
+ for (int i = 0; i < HNumCan; i++)
+ {
+ int Code = 65 + i;
+ System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
+ byte[] byteArray = new byte[] { (byte)Code };
+ string A = asciiEncoding.GetString(byteArray);
+ string No = Ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
+ grdMain_Pay.Rows[i].Cells[HTagCol2].Value = "*";
+ grdMain_Pay.Rows[i].Cells[HSnoCol2].Value = HSnoCol2+i;
+ grdMain_Pay.Rows[i].Cells[HInterID2].Value = Ds.Tables[0].Rows[0]["HInterID"].ToString();
+ grdMain_Pay.Rows[i].Cells[HBarCode2].Value = No + A;
+ grdMain_Pay.Rows[i].Cells[HQty2].Value = Ds.Tables[0].Rows[0]["鏉＄爜鏁伴噺"].ToString();
+ grdMain_Pay.Rows[i].Cells[HMaterCol2].Value = Ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain_Pay.Rows[i].Cells[HMaterName2].Value = Ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain_Pay.Rows[i].Cells[HMaterMould2].Value = Ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain_Pay.Rows[i].Cells[HBatchNo2].Value = Ds.Tables[0].Rows[0]["鎵瑰彿"].ToString();
+ }
}
}
else
@@ -271,5 +290,10 @@
}
}
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
}
}
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
index 8fb2595..e2effff 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
@@ -24,33 +24,38 @@
Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
- #region 鍥哄畾浠ｇ爜
+ #region 鍥哄畾浠ｇ爜
- private void initGrid()
+ private void Kf_BarCodeOutInReport_Load(object sender, EventArgs e)
{
- DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
- }
-
- //寰楀埌瀵瑰簲鍒�
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ SetFormCaption();
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ //oSumGrid.oGridsum = grdSum;
+ dtpHBDate.Value = DateTime.Today;
+ dtpHEDate.Value = DateTime.Today;
+ //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+ Sub_AddBillTypeList();
}
- private void tc_Click(object sender, EventArgs e)
+ //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+ private void Sub_AddBillTypeList()
{
- this.Close();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇鍗曟嵁绫诲瀷澶辫触");
+ return;
+ }
+ cmbBillType.Items.Clear();
+ cmbBillType.Items.Add("鍏ㄩ儴");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ cmbBillType.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBillTypeName"]));
+ }
+ cmbBillType.Text = "鍏ㄩ儴";
}
- //Kf_BarCodeOutInReportDlg oDlg = new Kf_BarCodeOutInReportDlg();
- private void cx_Click(object sender, EventArgs e)
- {
- //oDlg.ShowDialog();
- //if (oDlg.IsOk == 1)
- //{
- timer1.Enabled = true;
- //}
- }
//璁剧疆鎶ヨ〃鍚嶇О
private void SetFormCaption()
{
@@ -61,16 +66,16 @@
cmbBillType.SelectedIndex = 0;
}
-
- private void Frm_EasyReport_Load(object sender, EventArgs e)
+ private void initGrid()
{
- SetFormCaption();
- oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
- //oSumGrid.oGridsum = grdSum;
- dtpHBDate.Value = DateTime.Today;
- dtpHEDate.Value = DateTime.Today;
+ DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
}
+ //鍒濆鍖栬〃澶存樉绀�
+ private void initHeadCaption()
+ {
+
+ }
private void timer1_Tick(object sender, EventArgs e)
{
@@ -88,45 +93,10 @@
}
}
- private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+ private void timer2_Tick(object sender, EventArgs e)
{
- if (e.KeyValue == 13)
- timer1.Enabled = true;
- }
-
- private void mrlk_Click(object sender, EventArgs e)
- {
-
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
- }
-
- private void bclk_Click(object sender, EventArgs e)
- {
- //淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
- }
-
-
- //鎵撳嵃
- private void dy_Click(object sender, EventArgs e)
- {
- Sub_SetReport();
- Report.Print(true);
- }
- //棰勮
- private void view_Click(object sender, EventArgs e)
- {
- Sub_SetReport();
- Report.PrintPreview(true);
- }
-
- #endregion
-
- #region 鐣岄潰澶勭悊
- //鍒濆鍖栬〃澶存樉绀�
- private void initHeadCaption()
- {
-
+ timer2.Enabled = false;
+ timer1.Enabled = true;
}
private bool Fun_AllowQuery()//瀹℃牳鏌ヨ鏉′欢
@@ -139,43 +109,87 @@
return true;
}
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+
+ //寰楀埌瀵瑰簲鍒�
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.KeyValue == 13)
+ timer1.Enabled = true;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+
+ #endregion
+
+ #region 鏌ヨ鍔熻兘
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
private void Display()
{
ClsCN SubCn = new ClsCN();
DataSet DSet = new DataSet();
- //鏄剧ず鎶ヨ〃澶� 鏍囬
-
- //鏄剧ず杩囨护鏉′欢
-
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
sDlgWhere = sDlgWhere + ",'" + cmbBillType.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHBillNo.Text + "'";
- //sDlgWhere = sDlgWhere + ",'" + oDlg.cmbHSumType.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHSourceBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaker.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- //杩囨护鏉′欢
- //string sWhere = "";
- //sWhere = sWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + "," + ClsPub.isLong(txtHCusID.Tag) + "";
- //sWhere = sWhere + ",3";
- //if (sWhere.Trim().Length > 0)
- //{
- // sWhere = sWhere.Substring(1, sWhere.Length - 1);
- //}
- //
- DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport " + sDlgWhere, "h_p_Kf_BarCodeOutInReport");
+
+ DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport_New " + sDlgWhere, "h_p_Kf_BarCodeOutInReport_New");
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -199,36 +213,9 @@
#endregion
- #region 鎵撳嵃璁剧疆
+ #region 瀵煎嚭鍔熻兘
- //鎵撳嵃璁剧疆
- GridppReport Report;
- //璁剧疆鎵撳嵃妯＄増璺緞
- private void Sub_SetReport()
- {
- Report = new GridppReport();
- Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- }
- //濉叆鍗曟嵁琛ㄥご淇℃伅
- private void ReportBeforePostRecord()//your report?kao
- {
- //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
- //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
- //Report.FieldByName("CusName").AsString = lblHCusName.Text;
- //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
- }
- //濉叆鍗曟嵁鏄庣粏淇℃伅
- private void ReportFetchRecordByDataTable()
- {
- //BLL.Utility.FillRecordToReport(Report, grdMain, false);
- }
- #endregion
-
- #region 鏁版嵁瀵煎嚭
-
-
+ //寮曞嚭
private void yc_Click(object sender, EventArgs e)
{
//BLL.ClsPub_BLL.DataGridViewToExcel2(grdMain, this.Text);
@@ -321,46 +308,72 @@
}
}
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
#endregion
-
+ #region 閫�鍑哄姛鑳�
- private void timer2_Tick(object sender, EventArgs e)
+ private void tc_Click(object sender, EventArgs e)
{
- timer2.Enabled = false;
- //oDlg.ShowDialog();
- //if (oDlg.IsOk == 1)
- //{
- timer1.Enabled = true;
- //}
+ this.Close();
}
- private void Total()
+ #endregion
+
+ #region 鎵撳嵃鍔熻兘
+
+ //鎵撳嵃璁剧疆
+ GridppReport Report;
+
+ //棰勮
+ private void view_Click(object sender, EventArgs e)
{
- if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
- {
- oSumGrid.SetGridsum();
- oSumGrid.Total();
- }
+ Sub_SetReport();
+ Report.PrintPreview(true);
}
- private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
{
- Total();
+ Sub_SetReport();
+ Report.Print(true);
}
- private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ //璁剧疆鎵撳嵃妯＄増璺緞
+ private void Sub_SetReport()
{
- Total();
-
+ Report = new GridppReport();
+ Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
}
- private void grdMain_Paint(object sender, PaintEventArgs e)
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//your report?kao
{
- DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
+ //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
+ //Report.FieldByName("CusName").AsString = lblHCusName.Text;
+ //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
}
-
+ //濉叆鍗曟嵁鏄庣粏淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ //BLL.Utility.FillRecordToReport(Report, grdMain, false);
+ }
+
+ #endregion
+
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
index 2c8a4db..8c70245 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
@@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_BarCodeOutInReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dc = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -47,30 +48,36 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
- this.cmbBillType = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
- this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
- this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
- this.label5 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.txtHSPName = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.txtHWHName = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtHMater = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.txtHBatchNo = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.txtHBarCode = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
+ this.cmbBillType = new System.Windows.Forms.ComboBox();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.txtHBatchNo = new System.Windows.Forms.TextBox();
+ this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
+ this.txtHMater = new System.Windows.Forms.TextBox();
+ this.txtHSPName = new System.Windows.Forms.TextBox();
+ this.txtHWHName = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// timer1
@@ -85,6 +92,7 @@
this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dc,
this.yl,
this.toolStripSeparator4,
this.dy,
@@ -106,6 +114,21 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(35, 42);
+ this.dc.Text = "瀵煎嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.ToolTipText = "瀵煎嚭";
+ this.dc.Click += new System.EventHandler(this.dc_Click);
//
// yl
//
@@ -251,181 +274,12 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.pPic.Controls.Add(this.txtHBillNo);
- this.pPic.Controls.Add(this.label8);
- this.pPic.Controls.Add(this.cmbBillType);
- this.pPic.Controls.Add(this.label10);
- this.pPic.Controls.Add(this.dtpHBDate);
- this.pPic.Controls.Add(this.dtpHEDate);
- this.pPic.Controls.Add(this.label5);
- this.pPic.Controls.Add(this.label6);
- this.pPic.Controls.Add(this.txtHSPName);
- this.pPic.Controls.Add(this.label3);
- this.pPic.Controls.Add(this.txtHWHName);
- this.pPic.Controls.Add(this.label2);
- this.pPic.Controls.Add(this.txtHMater);
- this.pPic.Controls.Add(this.label4);
- this.pPic.Controls.Add(this.txtHBatchNo);
- this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBarCode);
- this.pPic.Controls.Add(this.label7);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
this.pPic.Location = new System.Drawing.Point(0, 47);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1138, 53);
+ this.pPic.Size = new System.Drawing.Size(1138, 41);
this.pPic.TabIndex = 17;
- //
- // cmbBillType
- //
- this.cmbBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbBillType.FormattingEnabled = true;
- this.cmbBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbBillType.Items.AddRange(new object[] {
- "鍏ㄩ儴",
- "澶栬喘鍏ュ簱",
- "浜у搧鍏ュ簱",
- "鐢熶骇棰嗘枡鍗�",
- "璋冩嫧鍗�",
- "鍏朵粬鍏ュ簱",
- "鍏朵粬鍑哄簱鍗�",
- "濮斿鍔犲伐鍏ュ簱鍗�",
- "濮斿鍔犲伐鍑哄簱鍗�"});
- this.cmbBillType.Location = new System.Drawing.Point(964, 2);
- this.cmbBillType.Name = "cmbBillType";
- this.cmbBillType.Size = new System.Drawing.Size(130, 20);
- this.cmbBillType.TabIndex = 62;
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(907, 6);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
- this.label10.TabIndex = 63;
- this.label10.Text = "鍗曟嵁绫诲瀷";
- //
- // dtpHBDate
- //
- this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(241, 2);
- this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
- this.dtpHBDate.TabIndex = 59;
- //
- // dtpHEDate
- //
- this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(241, 28);
- this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
- this.dtpHEDate.TabIndex = 61;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(179, 6);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(65, 12);
- this.label5.TabIndex = 58;
- this.label5.Text = "寮�濮嬫棩鏈燂細";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(179, 32);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(65, 12);
- this.label6.TabIndex = 60;
- this.label6.Text = "缁撴潫鏃ユ湡锛�";
- //
- // txtHSPName
- //
- this.txtHSPName.Location = new System.Drawing.Point(588, 28);
- this.txtHSPName.Name = "txtHSPName";
- this.txtHSPName.Size = new System.Drawing.Size(130, 21);
- this.txtHSPName.TabIndex = 57;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(545, 32);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(47, 12);
- this.label3.TabIndex = 56;
- this.label3.Text = "浠� 浣嶏細";
- //
- // txtHWHName
- //
- this.txtHWHName.Location = new System.Drawing.Point(588, 2);
- this.txtHWHName.Name = "txtHWHName";
- this.txtHWHName.Size = new System.Drawing.Size(130, 21);
- this.txtHWHName.TabIndex = 55;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(545, 6);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(47, 12);
- this.label2.TabIndex = 54;
- this.label2.Text = "浠� 搴擄細";
- //
- // txtHMater
- //
- this.txtHMater.Location = new System.Drawing.Point(409, 2);
- this.txtHMater.Name = "txtHMater";
- this.txtHMater.Size = new System.Drawing.Size(130, 21);
- this.txtHMater.TabIndex = 53;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(367, 6);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(47, 12);
- this.label4.TabIndex = 52;
- this.label4.Text = "鐗� 鏂欙細";
- //
- // txtHBatchNo
- //
- this.txtHBatchNo.Location = new System.Drawing.Point(409, 28);
- this.txtHBatchNo.Name = "txtHBatchNo";
- this.txtHBatchNo.Size = new System.Drawing.Size(130, 21);
- this.txtHBatchNo.TabIndex = 51;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(367, 32);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(47, 12);
- this.label1.TabIndex = 50;
- this.label1.Text = "鎵� 鍙凤細";
- //
- // txtHBarCode
- //
- this.txtHBarCode.Location = new System.Drawing.Point(772, 28);
- this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(130, 21);
- this.txtHBarCode.TabIndex = 49;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Location = new System.Drawing.Point(724, 32);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
- this.label7.TabIndex = 48;
- this.label7.Text = "鏉″舰鐮侊細";
//
// lblCaption
//
@@ -451,29 +305,238 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 100);
+ this.grdMain.Location = new System.Drawing.Point(0, 153);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1138, 353);
+ this.grdMain.Size = new System.Drawing.Size(1138, 300);
this.grdMain.TabIndex = 69;
+ //
+ // groupBox1
+ //
+ this.groupBox1.BackColor = System.Drawing.Color.Lavender;
+ this.groupBox1.Controls.Add(this.txtHSourceBillNo);
+ this.groupBox1.Controls.Add(this.txtHMaker);
+ this.groupBox1.Controls.Add(this.txtHBillNo);
+ this.groupBox1.Controls.Add(this.dtpHBDate);
+ this.groupBox1.Controls.Add(this.cmbBillType);
+ this.groupBox1.Controls.Add(this.txtHBarCode);
+ this.groupBox1.Controls.Add(this.txtHBatchNo);
+ this.groupBox1.Controls.Add(this.dtpHEDate);
+ this.groupBox1.Controls.Add(this.txtHMater);
+ this.groupBox1.Controls.Add(this.txtHSPName);
+ this.groupBox1.Controls.Add(this.txtHWHName);
+ this.groupBox1.Controls.Add(this.label9);
+ this.groupBox1.Controls.Add(this.label11);
+ this.groupBox1.Controls.Add(this.label8);
+ this.groupBox1.Controls.Add(this.label7);
+ this.groupBox1.Controls.Add(this.label10);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 88);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(1138, 65);
+ this.groupBox1.TabIndex = 71;
+ this.groupBox1.TabStop = false;
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(623, 40);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(122, 21);
+ this.txtHSourceBillNo.TabIndex = 69;
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(772, 2);
+ this.txtHBillNo.Location = new System.Drawing.Point(804, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(130, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(122, 21);
this.txtHBillNo.TabIndex = 65;
+ //
+ // dtpHBDate
+ //
+ this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHBDate.Location = new System.Drawing.Point(79, 14);
+ this.dtpHBDate.Name = "dtpHBDate";
+ this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHBDate.TabIndex = 59;
+ //
+ // cmbBillType
+ //
+ this.cmbBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbBillType.FormattingEnabled = true;
+ this.cmbBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbBillType.Items.AddRange(new object[] {
+ "鍏ㄩ儴"});
+ this.cmbBillType.Location = new System.Drawing.Point(993, 14);
+ this.cmbBillType.Name = "cmbBillType";
+ this.cmbBillType.Size = new System.Drawing.Size(122, 20);
+ this.cmbBillType.TabIndex = 62;
+ //
+ // txtHBarCode
+ //
+ this.txtHBarCode.Location = new System.Drawing.Point(623, 14);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(122, 21);
+ this.txtHBarCode.TabIndex = 49;
+ //
+ // txtHBatchNo
+ //
+ this.txtHBatchNo.Location = new System.Drawing.Point(253, 40);
+ this.txtHBatchNo.Name = "txtHBatchNo";
+ this.txtHBatchNo.Size = new System.Drawing.Size(122, 21);
+ this.txtHBatchNo.TabIndex = 51;
+ //
+ // dtpHEDate
+ //
+ this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHEDate.Location = new System.Drawing.Point(79, 40);
+ this.dtpHEDate.Name = "dtpHEDate";
+ this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHEDate.TabIndex = 61;
+ //
+ // txtHMater
+ //
+ this.txtHMater.Location = new System.Drawing.Point(253, 14);
+ this.txtHMater.Name = "txtHMater";
+ this.txtHMater.Size = new System.Drawing.Size(122, 21);
+ this.txtHMater.TabIndex = 53;
+ //
+ // txtHSPName
+ //
+ this.txtHSPName.Location = new System.Drawing.Point(429, 40);
+ this.txtHSPName.Name = "txtHSPName";
+ this.txtHSPName.Size = new System.Drawing.Size(122, 21);
+ this.txtHSPName.TabIndex = 57;
+ //
+ // txtHWHName
+ //
+ this.txtHWHName.Location = new System.Drawing.Point(429, 14);
+ this.txtHWHName.Name = "txtHWHName";
+ this.txtHWHName.Size = new System.Drawing.Size(122, 21);
+ this.txtHWHName.TabIndex = 55;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.BackColor = System.Drawing.Color.Transparent;
+ this.label9.Location = new System.Drawing.Point(559, 44);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(65, 12);
+ this.label9.TabIndex = 68;
+ this.label9.Text = "婧愬崟鍗曞彿锛�";
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(724, 6);
+ this.label8.Location = new System.Drawing.Point(752, 18);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(53, 12);
this.label8.TabIndex = 64;
this.label8.Text = "鍗曟嵁鍙凤細";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(559, 18);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 12);
+ this.label7.TabIndex = 48;
+ this.label7.Text = "鏉＄爜缂栧彿锛�";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(931, 18);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(65, 12);
+ this.label10.TabIndex = 63;
+ this.label10.Text = "鍗曟嵁绫诲瀷锛�";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(209, 44);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(47, 12);
+ this.label1.TabIndex = 50;
+ this.label1.Text = "鎵� 鍙凤細";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(209, 18);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(47, 12);
+ this.label4.TabIndex = 52;
+ this.label4.Text = "鐗� 鏂欙細";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(17, 18);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.TabIndex = 58;
+ this.label5.Text = "寮�濮嬫棩鏈燂細";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(17, 44);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(65, 12);
+ this.label6.TabIndex = 60;
+ this.label6.Text = "缁撴潫鏃ユ湡锛�";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.BackColor = System.Drawing.Color.Transparent;
+ this.label2.Location = new System.Drawing.Point(383, 18);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(47, 12);
+ this.label2.TabIndex = 54;
+ this.label2.Text = "浠� 搴擄細";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.BackColor = System.Drawing.Color.Transparent;
+ this.label3.Location = new System.Drawing.Point(383, 44);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(47, 12);
+ this.label3.TabIndex = 56;
+ this.label3.Text = "浠� 浣嶏細";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.Location = new System.Drawing.Point(752, 44);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.TabIndex = 66;
+ this.label11.Text = "鍒跺崟浜猴細";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.Location = new System.Drawing.Point(804, 40);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(122, 21);
+ this.txtHMaker.TabIndex = 67;
//
// Kf_BarCodeOutInReport
//
@@ -481,19 +544,22 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1138, 453);
this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
this.Name = "Kf_BarCodeOutInReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- this.Load += new System.EventHandler(this.Frm_EasyReport_Load);
+ this.Load += new System.EventHandler(this.Kf_BarCodeOutInReport_Load);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Xs_SellOutPriceReport_KeyUp);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.pPic.ResumeLayout(false);
this.pPic.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -519,24 +585,30 @@
private System.Windows.Forms.Panel pPic;
private System.Windows.Forms.Label lblCaption;
private System.Windows.Forms.Timer timer2;
- public System.Windows.Forms.TextBox txtHBarCode;
- private System.Windows.Forms.Label label7;
private System.Windows.Forms.DataGridView grdMain;
- private System.Windows.Forms.TextBox txtHSPName;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox txtHWHName;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtHMater;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.TextBox txtHBatchNo;
- private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ public System.Windows.Forms.TextBox txtHSourceBillNo;
+ public System.Windows.Forms.TextBox txtHBillNo;
private System.Windows.Forms.DateTimePicker dtpHBDate;
+ private System.Windows.Forms.ComboBox cmbBillType;
+ public System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.TextBox txtHBatchNo;
private System.Windows.Forms.DateTimePicker dtpHEDate;
+ private System.Windows.Forms.TextBox txtHMater;
+ private System.Windows.Forms.TextBox txtHSPName;
+ private System.Windows.Forms.TextBox txtHWHName;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
- private System.Windows.Forms.ComboBox cmbBillType;
- private System.Windows.Forms.Label label10;
- public System.Windows.Forms.TextBox txtHBillNo;
- private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ToolStripButton dc;
+ public System.Windows.Forms.TextBox txtHMaker;
+ private System.Windows.Forms.Label label11;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
index aa2e908..1f3411a 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
@@ -112,18 +112,18 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>98, 21</value>
</metadata>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>188, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -251,6 +251,20 @@
p6K5iiiwHT0VzFKaLAdNRXMUUWA6eiuYoosB09FcxRRYDp6K5iiiwHT0VzFFFgOnormKKLAdPRXMUUWA
6eiuYoosB09FcxRRYDp6K5igUWA6eiuYoosB09FcxRRYDp6K5mkosB09FcxRRYDp6K5iiiwHT0VzFFFg
OnormKKLAf/Z
+</value>
+ </data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3902,10 +3916,10 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>266, 21</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>42</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
index 9ffb714..55b3f29 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
@@ -23,25 +23,140 @@
public string ViewName = "h_v_KF_ICInventoryList_WMS";
public string ModCaption = "鏉＄爜搴撳瓨鏌ヨ";
public const string ModName = "3302";
- public const string ModRightName = "Gy_BarCodeBillList";
- //public const string ModRightNameEdit = ModRightName + "_Edit";
- //public const string ModRightNameCheck = ModRightName + "_Check";
- //public const string ModRightNameClose = ModRightName + "_Close";
- public const string ModRightNameDelete = ModRightName + "_Delete";
- public const string ModRightNamePrint = ModRightName + "_Print";
- //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //public Gy_ICBomBill oFrm;
public string sDlgWhere = ""; //澶栫獥浣撻�掑叆
public int selectRow = 0;
Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
- //
+
+
+ #region 鍥哄畾浠ｇ爜
+
+ private void Kf_ICInventory_BarCode_Load(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ lblCaption.Text = ModCaption;
+ initGrid();
+ }
+
private void initGrid()
{
- DBUtility.Xt_BaseBillFun.initGridList(grdMain,this.Name);
-
+ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
grdMain.ReadOnly = false;
}
- //
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ initGrid();
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ timer2.Enabled = false;
+ if (sDlgWhere == "")
+ {
+ }
+ else
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+
+ private void GraphLine()
+ {
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //string s = frmCondition.cmbHComplete.Text;
+ //long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ ////鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int sHQtyCol = Fun_GetCol("鏁伴噺");
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (i != sHQtyCol)
+ {
+ e.Cancel = true;
+ }
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+
+ #endregion
+
+ #region 鏌ヨ鍔熻兘
+
+ //鏌ヨ
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
private void Display()
{
@@ -79,551 +194,26 @@
//鍐荤粨
int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
string s = frmCondition.cmbHComplete.Text;
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
//鐢荤嚎
GraphLine();
-
Total();
- //
- }
- //
- private void timer1_Tick(object sender, EventArgs e)
- {
- timer1.Enabled = false;
- initGrid();
- //Sub_FastQuery();
- }
-
- private void tc_Click(object sender, EventArgs e)
- {
- this.Close();
- }
-
- private void sx_Click(object sender, EventArgs e)
- {
- timer1.Enabled = true;
- }
-
- private void dj_Click(object sender, EventArgs e)
- {
- Sub_ShowBill();
- }
- //鏄剧ず鍗曟嵁
- private void Sub_ShowBill()
- {
- //Int64 lngBillKey = 0;
- //if (grdMain.CurrentRow == null)
- // return;
- //lngBillKey =DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- //if (lngBillKey == 0)
- // return;
- //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- //{
- // oFrm = new Gy_ICBomBill();
- // oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- // oFrm.BillOld = oBill;
- // oFrm.ShowDialog();
- // if (oFrm.BillChange)
- // {
- // if (MessageBox.Show("鍗曟嵁鍒楄〃宸茬粡鍙戠敓鍙樺寲,鏄惁鍒锋柊", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
- // {
- // timer1.Enabled = true;
- // }
- // }
- //}
- //else
- //{
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- //}
- //oBill = null;
- }
- //
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
- }
- //
- private void Kf_ICInventory_BarCode_Load(object sender, EventArgs e)
- {
- //
- frmCondition = new frmBillQueryCondition_New();
- this.Text = ModCaption;
- oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
- oSumGrid.oGridsum = grdSum;
- lblCaption.Text = ModCaption;
- initGrid();
- //鍒濆鍖栧揩閫熻繃婊�
- //dtpHBDate.Checked = false;
- //dtpHEDate.Checked = false;
- cmbHStatus.SelectedIndex = 0;
- }
-
- private void grdMain_DblClick(object sender, EventArgs e)
- {
- Sub_ShowBill();
- }
-
- private void cx_Click(object sender, EventArgs e)
- {
- frmCondition = new frmBillQueryCondition_New();
- SetCondition(frmCondition, ViewName, this.Name);
- frmCondition.ShowDialog();
- if (frmCondition.Tag.ToString() == "OK")
- {
- Display();
- //Sub_FastQuery();
- }
- }
-
- public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
- {
- frmCondition.Tag = "";
- frmCondition.ViewName = ViewName;
- frmCondition.ModName = Name;
- }
-
- private void xz_Click(object sender, EventArgs e)
- {
- //
- //oFrm = new Gy_ICBomBill();
- //oFrm.ShowDialog();
- }
-
- private void sc_Click(object sender, EventArgs e)
- {
- Sub_DeleteBill();
- }
- //鍒犻櫎
- private void Sub_DeleteBill()
- {
- // //缂栬緫鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true,DBUtility.ClsPub.CurUserName))
- // {
- // return;
- // }
- // //
- // Int64 lngBillKey = 0;
- // if (grdMain.CurrentRow == null)
- // return;
- // lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- // if (lngBillKey == 0)
- // return;
- // DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
- // {
- // if (oBill.omodel.HChecker != "")
- // {
- // MessageBox.Show("鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�", "鎻愮ず");
- // return;
- // }
- // if (!oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- // return;
- // }
- // else
- // {
- // Display();
- // }
-
- // }
- // }
- // else
- // {
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- // }
- }
-
- private void timer2_Tick(object sender, EventArgs e)
- {
- timer2.Enabled = false;
- if (sDlgWhere == "")
- {
- //frmCondition = new frmBillQueryCondition_New();
- //SetCondition(frmCondition, ViewName, this.Name);
- //frmCondition.ShowDialog();
- //if (frmCondition.Tag.ToString() == "OK")
- //{
- // timer1.Enabled = true;
- //}
- //Sub_FastQuery();
- }
- else
- {
- timer1.Enabled = true;
- }
- }
-
-
-
- private void bclk_Click(object sender, EventArgs e)
- {
- //淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
- }
-
- private void mrlk_Click(object sender, EventArgs e)
- {
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
- }
- //
- private void GraphLine()
- {
- //int MainIDCol = Fun_GetCol("hmainid");
- //int SubIDCol = Fun_GetCol("hsubid");
- //string s = frmCondition.cmbHComplete.Text;
- //long n=0;
- //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
- ////鏄剧ず
- //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
- //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
- }
- //瀹℃牳
- private void sh_Click(object sender, EventArgs e)
- {
- ////this.Sub_CheckBill();
- //if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //if (grdMain.CurrentRow == null)
- // return;
- //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- //if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- //{
- // return;
- //}
- //for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- //{
- // if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- // {
- // if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- // {
- // MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
- // return;
- // }
- // }
- //}
- //MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
- //Sub_FastQuery();
- }
-
- //瀹℃牳鍗曟嵁
- private void Sub_CheckBill()
- {
- //瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() != "")
- {
- MessageBox.Show("鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //瀹℃牳
- if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //鍙嶅鍗曟嵁
- private void Sub_AbandonCheck()
- {
- //瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() == "")
- {
- MessageBox.Show("鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //鍙嶅鏍�
- if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("鍙嶅鏍告垚鍔�!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //浣滃簾
- private void qsh_Click(object sender, EventArgs e)
- {
- ////Sub_AbandonCheck();
- //if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //if (grdMain.CurrentRow == null)
- // return;
- //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- //if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- //{
- // return;
- //}
- //for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- //{
- // if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- // {
- // if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- // {
- // MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
- // return;
- // }
- // }
- //}
- //MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
- //Sub_FastQuery();
- }
-
- private void GraphicsGrid()
- {
- DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
- }
-
- #region //鎵撳嵃璁剧疆
-
- GridppReport Report;
- //棰勮
- private void yl_Click(object sender, EventArgs e)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("鎵撳嵃娆℃暟")].Value) > 0)
- {
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(ModRightNamePrint, 1, false, DBUtility.ClsPub.CurUserName))
- {
- MessageBox.Show("鎵�閫夋潯鐮佸凡缁忔墦鍗帮紝鎮ㄦ病鏈夋潈闄愶紝涓嶈兘閲嶅鎵撳嵃锛�");
- return;
- }
- }
- }
- //閫夋嫨鎵撳嵃妯℃澘
- string sErr = "";
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.PrintPreview(false);
- //oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- //
- }
- }
- }
-
- private void Sub_SetReport(string sOpenTmp)
- {
- //鍒ゆ柇琛屾暟
- //
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- }
-
- //濉叆鍗曟嵁琛ㄥご淇℃伅
- private void ReportBeforePostRecord()//your report?kao
- {
- Report.FieldByName("鏉＄爜缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
- Report.FieldByName("鏁伴噺").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏁伴噺")].Value);
- Report.FieldByName("鍗曚綅").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁￠噺鍗曚綅")].Value);
- Report.FieldByName("鍏ュ簱鏃ユ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏃ユ湡")].Value);
- //鎴愬搧
- Report.FieldByName("瀹㈡埛鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value);
- Report.FieldByName("浜у搧浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
- Report.FieldByName("浜у搧鍥惧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
- Report.FieldByName("浜у搧鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
- Report.FieldByName("鍖呰鏂瑰紡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍖呰鏂瑰紡")].Value);
- Report.FieldByName("鐢熶骇璁″垝").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("婧愬崟鍗曞彿")].Value);
- Report.FieldByName("鎴愬搧鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎵瑰彿")].Value);
- Report.FieldByName("鐢熶骇杞﹂棿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐢熶骇杞﹂棿")].Value);
- Report.FieldByName("鐢熶骇鍛ㄦ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐢熶骇鍛ㄦ湡")].Value);
- //鍘熸枡
- Report.FieldByName("渚涘簲鍟嗗悕绉�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value);
- Report.FieldByName("鐗╂枡浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
- Report.FieldByName("鐗屽彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
- Report.FieldByName("鍨嬪彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
- Report.FieldByName("鐐夊彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐐夊彿")].Value);
- Report.FieldByName("鐗╂枡鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎵瑰彿")].Value);
- if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("灏炬暟")].Value) == "灏炬暟")
- {
- Report.FieldByName("灏炬暟").AsString = "/////////////////////////";
- }
- else
- {
- Report.FieldByName("灏炬暟").AsString = "";
- }
- }
-
- private void ReportFetchRecordByDataTable()
- {
- BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("鏉＄爜缂栧彿"));
}
#endregion
- //
- private void grdMain_Paint(object sender, PaintEventArgs e)
- {
- GraphicsGrid();
- }
- //鍚堣 new
- private void Total()
- {
- if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
- {
- oSumGrid.SetGridsum();
- oSumGrid.Total();
- }
- }
- //鍚堣 new
- private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
- {
- Total();
- }
- //鍚堣 new
- private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
- {
- Total();
- }
-
- private void dy_Click(object sender, EventArgs e)
- {
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- //
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- }
- }
- }
-
- private void dy2_Click(object sender, EventArgs e)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("鎵撳嵃娆℃暟")].Value) > 0)
- {
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(ModRightNamePrint, 1, false, DBUtility.ClsPub.CurUserName))
- {
- MessageBox.Show("鎵�閫夋潯鐮佸凡缁忔墦鍗帮紝鎮ㄦ病鏈夋潈闄愶紝涓嶈兘閲嶅鎵撳嵃锛�");
- return;
- }
- }
- }
- //
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- //
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- //
- //Thread.Sleep(300);
- }
- }
- }
-
- private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
- {
- int sHQtyCol = Fun_GetCol("鏁伴噺");
- int i = grdMain.CurrentCell.ColumnIndex;
- if (i != sHQtyCol)
- {
- e.Cancel = true;
- }
- }
+ #region 蹇�熸煡璇�
//蹇�熻繃婊�
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ Sub_FastQuery();
+ }
+
private void Sub_FastQuery()
{
string sFastSQL = "";
- //鐗╂枡
- //if (cmbHStatus.Text.Trim() == "姝ｅ父")
- //{
- // sFastSQL = sFastSQL + " and hstopflag=0 ";
- //}
- //else
- //{
- // sFastSQL = sFastSQL + " and hstopflag=1 ";
- //}
//鐗╂枡
if (txtHMater.Text.Trim() != "")
{
@@ -659,11 +249,11 @@
sDlgWhere = "";
}
- private void btnOK_Click(object sender, EventArgs e)
- {
- Sub_FastQuery();
- }
+ #endregion
+ #region 瀵煎嚭鍔熻兘
+
+ //寮曞嚭
private void yc_Click(object sender, EventArgs e)
{
//BLL.ClsPub_BLL.DataGridViewToExcel2(grdMain, this.Text);
@@ -756,6 +346,88 @@
}
}
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+
+ #endregion
+
+ #region 閫�鍑哄姛鑳�
+
+ //閫�鍑哄姛鑳�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ #endregion
+
+ #region 鎵撳嵃鍔熻兘
+
+ GridppReport Report;
+
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ selectRow = i;
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ }
+ }
+ }
+
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ selectRow = i;
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(false);
+ }
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()
+ {
+ //Report.FieldByName("鏉＄爜缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("鏉＄爜缂栧彿"));
+ }
+
+ #endregion
+
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
index 4a9e1f9..55716a2 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
@@ -37,19 +37,10 @@
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.dy2 = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.yc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
- this.sx = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.xz = new System.Windows.Forms.ToolStripButton();
- this.dj = new System.Windows.Forms.ToolStripButton();
- this.sc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.sh = new System.Windows.Forms.ToolStripButton();
- this.qsh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -63,8 +54,6 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.cmbHStatus = new System.Windows.Forms.ComboBox();
- this.label5 = new System.Windows.Forms.Label();
this.txtHSPName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtHWHName = new System.Windows.Forms.TextBox();
@@ -77,6 +66,8 @@
this.label1 = new System.Windows.Forms.Label();
this.btnOK = new System.Windows.Forms.Button();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -91,8 +82,6 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.pPic.Controls.Add(this.cmbHStatus);
- this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
@@ -149,19 +138,12 @@
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dy,
- this.dy2,
this.yl,
+ this.toolStripSeparator1,
+ this.dc,
this.yc,
this.toolStripSeparator2,
this.cx,
- this.sx,
- this.toolStripSeparator1,
- this.xz,
- this.dj,
- this.sc,
- this.toolStripSeparator5,
- this.sh,
- this.qsh,
this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
@@ -192,21 +174,6 @@
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Visible = false;
this.dy.Click += new System.EventHandler(this.dy_Click);
- //
- // dy2
- //
- this.dy2.AutoSize = false;
- this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
- this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy2.ImageTransparentColor = System.Drawing.Color.White;
- this.dy2.Name = "dy2";
- this.dy2.Size = new System.Drawing.Size(36, 47);
- this.dy2.Text = "杩炴墦";
- this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy2.Visible = false;
- this.dy2.Click += new System.EventHandler(this.dy2_Click);
//
// yl
//
@@ -256,111 +223,10 @@
this.cx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.cx.Click += new System.EventHandler(this.cx_Click);
//
- // sx
- //
- this.sx.AutoSize = false;
- this.sx.Image = ((System.Drawing.Image)(resources.GetObject("sx.Image")));
- this.sx.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sx.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sx.Name = "sx";
- this.sx.Size = new System.Drawing.Size(36, 47);
- this.sx.Text = "鍒锋柊";
- this.sx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sx.Click += new System.EventHandler(this.sx_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator1.Visible = false;
- //
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(36, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Visible = false;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
- // dj
- //
- this.dj.AutoSize = false;
- this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
- this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dj.ImageTransparentColor = System.Drawing.Color.White;
- this.dj.Name = "dj";
- this.dj.Size = new System.Drawing.Size(36, 47);
- this.dj.Text = "鍗曟嵁";
- this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dj.Visible = false;
- this.dj.Click += new System.EventHandler(this.dj_Click);
- //
- // sc
- //
- this.sc.AutoSize = false;
- this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
- this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sc.Name = "sc";
- this.sc.Size = new System.Drawing.Size(36, 47);
- this.sc.Text = "鍒犻櫎";
- this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sc.Visible = false;
- this.sc.Click += new System.EventHandler(this.sc_Click);
- //
- // toolStripSeparator5
- //
- this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
- //
- // sh
- //
- this.sh.AutoSize = false;
- this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
- this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sh.Name = "sh";
- this.sh.Size = new System.Drawing.Size(40, 47);
- this.sh.Text = "鍙嶄綔搴�";
- this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sh.Visible = false;
- this.sh.Click += new System.EventHandler(this.sh_Click);
- //
- // qsh
- //
- this.qsh.AutoSize = false;
- this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
- this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.qsh.Name = "qsh";
- this.qsh.Size = new System.Drawing.Size(36, 47);
- this.qsh.Text = "浣滃簾";
- this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.qsh.Visible = false;
- this.qsh.Click += new System.EventHandler(this.qsh_Click);
- //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator4.Visible = false;
//
// tc
//
@@ -449,11 +315,10 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1011, 382);
this.grdMain.TabIndex = 19;
- this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdPrint
//
@@ -486,32 +351,9 @@
this.groupBox1.TabIndex = 51;
this.groupBox1.TabStop = false;
//
- // cmbHStatus
- //
- this.cmbHStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHStatus.FormattingEnabled = true;
- this.cmbHStatus.Items.AddRange(new object[] {
- "姝ｅ父",
- "浣滃簾"});
- this.cmbHStatus.Location = new System.Drawing.Point(265, 7);
- this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(68, 20);
- this.cmbHStatus.TabIndex = 20;
- this.cmbHStatus.Visible = false;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(230, 11);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
- this.label5.TabIndex = 19;
- this.label5.Text = "鐘舵�侊細";
- this.label5.Visible = false;
- //
// txtHSPName
//
- this.txtHSPName.Location = new System.Drawing.Point(745, 13);
+ this.txtHSPName.Location = new System.Drawing.Point(743, 14);
this.txtHSPName.Name = "txtHSPName";
this.txtHSPName.Size = new System.Drawing.Size(130, 21);
this.txtHSPName.TabIndex = 18;
@@ -527,7 +369,7 @@
//
// txtHWHName
//
- this.txtHWHName.Location = new System.Drawing.Point(572, 13);
+ this.txtHWHName.Location = new System.Drawing.Point(571, 14);
this.txtHWHName.Name = "txtHWHName";
this.txtHWHName.Size = new System.Drawing.Size(130, 21);
this.txtHWHName.TabIndex = 16;
@@ -535,7 +377,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(530, 18);
+ this.label2.Location = new System.Drawing.Point(531, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(47, 12);
this.label2.TabIndex = 15;
@@ -551,7 +393,7 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(357, 19);
+ this.label6.Location = new System.Drawing.Point(359, 18);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 12);
this.label6.TabIndex = 13;
@@ -567,7 +409,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(13, 19);
+ this.label4.Location = new System.Drawing.Point(15, 18);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(47, 12);
this.label4.TabIndex = 11;
@@ -575,7 +417,7 @@
//
// txtHBatchNo
//
- this.txtHBatchNo.Location = new System.Drawing.Point(227, 13);
+ this.txtHBatchNo.Location = new System.Drawing.Point(227, 14);
this.txtHBatchNo.Name = "txtHBatchNo";
this.txtHBatchNo.Size = new System.Drawing.Size(130, 21);
this.txtHBatchNo.TabIndex = 1;
@@ -583,7 +425,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(187, 19);
+ this.label1.Location = new System.Drawing.Point(187, 18);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 0;
@@ -591,7 +433,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(877, 13);
+ this.btnOK.Location = new System.Drawing.Point(880, 13);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(73, 24);
this.btnOK.TabIndex = 6;
@@ -613,6 +455,27 @@
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.grdSum.Size = new System.Drawing.Size(1011, 19);
this.grdSum.TabIndex = 52;
+ //
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "瀵煎嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.ToolTipText = "瀵煎嚭";
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Visible = false;
//
// Kf_ICInventory_BarCode
//
@@ -652,14 +515,9 @@
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton cx;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
public System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.ToolStripButton sx;
- private System.Windows.Forms.ToolStripButton dj;
- private System.Windows.Forms.ToolStripButton xz;
- private System.Windows.Forms.ToolStripButton sc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
@@ -667,16 +525,12 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
- private System.Windows.Forms.ToolStripButton sh;
- private System.Windows.Forms.ToolStripButton qsh;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
private System.Windows.Forms.DataGridView grdPrint;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStripButton dy2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.TextBox txtHBatchNo;
@@ -689,9 +543,9 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtHWHName;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.ComboBox cmbHStatus;
- private System.Windows.Forms.Label label5;
private System.Windows.Forms.ToolStripButton yc;
private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
index 3eca290..47bfc22 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3924,16 +3924,6 @@
u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
- <data name="dy2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
- jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
- grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
- FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
- u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
-</value>
- </data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3945,6 +3935,20 @@
NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3971,84 +3975,6 @@
oXs9qiieYFzuPSiSvmMYkef5B9h5hyvM1NoFGlmIXFPo6IWcJv9h5clA7oepFQ4HHLTFi7svsPoMG2+Q
UtDPT4GC2XgTpCe5X/YktlNs733486C5AJ9FHdrrRaLxARuoscFuuEjwX1RQNqzRzWXDfhTy670qMY7z
BdYeeKA8svstAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
- ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
- e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
- 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
- zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
- RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
- /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
- uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
- GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
- ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
- BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
- WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
- U5njFPWGMF5qmIOIl3UlCAOTbm5E4yrKv0jTLfPWrcw1hZyXAELfmMAbHzEFJRupxj0QBc4gm681xAr/
- nRXgGp7hgffIJ4aj2VI005zvvMoyg2icvXqTe9AzOMXFq2RcUsSSYlwekee6+dVMQHf/BBfP4Ri+fFgi
- Vhzwt5no6h3lh8e3KD69yyy6dYIC8KI5x3x0cmb9SB3OId68f5Hw/jXCItisPSCqVxzy/c3kSduNgB4z
- 4CeZgPY6YH2HPGk7QGOLA8trG7C8xhJRVlVvhqTZ3t0z+8YseUw3wBfmDAtHelBh/AAAAABJRU5ErkJg
- gg==
-</value>
- </data>
- <data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
- BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
- CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
- tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
- cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
- iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
- wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
- GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
- gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
- vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
- mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
- 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
- SUVORK5CYII=
-</value>
- </data>
- <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
- d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
- hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
- M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
- cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
- gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
- SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
- 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
- C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
- TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
- 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
- RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
- GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
- XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
- PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4091,13 +4017,13 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
index 4cf7951..3d1325f 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
@@ -77,7 +77,7 @@
private void Sub_AddBillTypeList()
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeStatusQuery_BillType ", "h_p_WMS_BarCodeStatusQuery_BillType");
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鑾峰彇鍗曟嵁绫诲瀷澶辫触");
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index 6a850d8..d6e7724 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -231,11 +231,11 @@
bool HEndFlag = list[0].HEndFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg4, 1, false, msg3))
+ if (!DBUtility.ClsPub.Security_Log(msg4, 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -316,11 +316,11 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
@@ -439,188 +439,6 @@
}
#endregion
- //#region [妯″叿鍒嗙被瀹℃牳銆佸弽瀹℃牳]
- //[Route("Gy_ModelType/ModelTypeCheck")]
- //[HttpGet]
- //public object ModelTypeCheck(int HInterID, int IsAudit, string CurUserName)
- //{
- // string ModRightNameCheck = "Gy_MouldType_Check";
- // DBUtility.ClsPub.CurUserName = CurUserName;
- // try
- // {
- // //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HInterID <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "HInterID灏忎簬0锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // ds = oCN.RunProcReturn("Select * from Gy_MouldType Where HItemID=" + lngBillKey.ToString(), "Gy_MouldType");
- // if (ds.Tables[0].Rows.Count != 0)
- // {
- // string HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
- // string HDeleteMan = ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
- // string HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
- // if (HCloseMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HDeleteMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鍒ゆ柇
- // {
- // if (HChecker.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
- // {
- // if (HChecker.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // if (IsAudit == 0) //瀹℃牳鎻愪氦
- // {
- // //瀹℃牳鎻愪氦
- // if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳鎴愬姛";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍告彁浜�
- // {
- // //鍙嶅鏍告彁浜bandonCheck
- // if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍙嶅鏍告垚鍔�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- ////瀹℃牳
- //public bool CheckBill(Int64 lngBillKey, ref string sReturn)
- //{
- // //妯″叿妗ｆ鏈夋渚�
- // try
- // {
- // string HChecker = DBUtility.ClsPub.CurUserName;
- // string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- // oCN.BeginTran();
- // oCN.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
- // oCN.Commit();
- // //鐢熸垚璋冩嫧鍗�
- // //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
- // //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
- // //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
- // //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
- // //
- // sReturn = "瀹℃牳鍗曟嵁鎴愬姛锛�";
- // return true;
- // }
- // catch (Exception e)
- // {
- // sReturn = e.Message;
- // throw (e);
- // }
- //}
-
- ////鍙嶅鏍�
- //public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
- //{
-
- // try
- // {
- // string HChecker = DBUtility.ClsPub.CurUserName;
- // string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- // oCN.BeginTran();
- // //杩樺師鍗曟嵁鐘舵�佷负鏈鏍哥姸鎬�
- // oCN.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
- // sReturn = "鍙嶅鏍稿崟鎹垚鍔燂紒";
- // oCN.Commit();
- // return true;
- // }
- // catch (Exception e)
- // {
- // sReturn = e.Message;
- // throw (e);
- // }
- //}
- //#endregion
+
}
}
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index c57bd54..828d0e7 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -246,7 +246,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_RoutingBillSub where HInterID=" + lngBillKey, "Gy_RoutingBillSub");
+ ds = oCN.RunProcReturn("select * from Gy_RoutingBillmain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -255,12 +255,21 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
- //if (HChecker != " ")
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //if (hdeleteman != "")
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ // objJsonResult.Message = "鍗曟嵁宸茬粡浣滃簾,涓嶈兘鍒犻櫎锛�";
// objJsonResult.data = null;
// return objJsonResult;
//}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
index e3a6c4c..0d4a8ee 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -23,10 +23,20 @@
#region 鍣ㄥ叿淇濆吇瑙勭▼鍗曞垪琛�
[Route("Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList")]
[HttpGet]
- public object GetMouldMaintainRuleList(string sWhere)
+ public object GetMouldMaintainRuleList(string sWhere,string user)
{
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Sc_MouldMaintainRuleBillList " + sWhere + " order by hmainid desc", "h_v_Sc_MouldMaintainRuleBillList");
@@ -68,8 +78,18 @@
#region 鍣ㄥ叿淇濆吇瑙勭▼璁板綍鍒犻櫎鍔熻兘
[Route("Sc_MouldMaintainRuleBill/DeltetMouldMaintainRuleBillList")]
[HttpGet]
- public object DeltetMouldMaintainRuleBillList(string HInterID)
+ public object DeltetMouldMaintainRuleBillList(string HInterID,string user)
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
@@ -250,11 +270,22 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBill_Edit", 1, false, msg5))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldMaintainRuleBill oBill = new DAL.ClsSc_MouldMaintainRuleBill();
List<Model.ClsSc_MouldMaintainRuleBillMain> lsmain = new List<Model.ClsSc_MouldMaintainRuleBillMain>();
msg2 = msg2.Replace("\\", "");
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 938f895..ea81492 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -93,14 +93,14 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string s = "";
Int64 lngBillKey = 0;
try
@@ -192,20 +192,19 @@
[HttpGet]
public object set_CheckBill(int HInterID, string CurUserName)
{
- //string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
try
{
////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//瀹℃牳鍓嶅垽鏂槸鍚﹀厑璁�
string s = "";
if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
index e5b13d8..2090c65 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -1,9 +1,11 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.Http;
+using WebAPI.DLL;
using WebAPI.Models;
namespace WebAPI.Controllers.SBGL
@@ -12,6 +14,9 @@
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ ClsSb_EquipRepairSendWorkBillMain omodel = new ClsSb_EquipRepairSendWorkBillMain();
+ List<ClsSb_EquipRepairSendWorkBillSub> DetailColl = new List<ClsSb_EquipRepairSendWorkBillSub>();
+ ClsSb_EquipRepairSendWorkBill oBill = new ClsSb_EquipRepairSendWorkBill();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
@@ -23,7 +28,7 @@
{
try
{
- string sql = "select * from h_v_Sb_EquipRepairSendWorkBillList ";
+ string sql = "select * from h_v_Sb_EquipRepairSendWorkBillList where 1=1 ";
if (sWhere == "" || sWhere == null)
{
ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRepairSendWorkBillList");
@@ -59,6 +64,222 @@
#endregion
#region 璁惧缁翠慨娲惧伐鍗� 娣诲姞/淇敼
+ [Route("Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ try
+ {
+ omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSb_EquipRepairSendWorkBillMain>(msg2);
+ string BillType = "3909";
+
+
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into Sb_EquipRepairSendWorkBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HExplanation,HInnerBillNo,HRepairID,HEmpID" +
+ ",HManagerID,HDeptID,HRepairContent,HRepairPlanBeginDate,HRepairPlanEndDate" +
+ ",HPlanTimes,HCycleUnit" +
+ ") " +
+ " values('" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HRepairID.ToString() + "," + omodel.HEmpID.ToString() +
+ "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairContent + "','" + omodel.HRepairPlanBeginDate + "','" + omodel.HRepairPlanEndDate + "'" +
+ "," + omodel.HPlanTimes.ToString() + ",'" + omodel.HCycleUnit + "'" +
+ ") ");
+
+ }
+ else if (OperationType == 3)
+ {
+ //淇敼
+ oCN.RunProc("UpDate Sb_EquipRepairSendWorkBillMain set " +
+ "HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
+ ",HUpDateDate=getdate()" +
+ //=========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HRepairID=" + omodel.HRepairID.ToString() +
+ ",HPlanTimes=" + omodel.HPlanTimes.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HRepairPlanBeginDate='" + omodel.HRepairPlanBeginDate + "'" +
+ ",HRepairPlanEndDate='" + omodel.HRepairPlanEndDate + "'" +
+ ",HRepairContent='" + omodel.HRepairContent + "'" +
+ ",HCycleUnit='" + omodel.HCycleUnit + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + omodel.HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sb_EquipRepairSendWorkBillSub where HInterID='" + omodel.HInterID + "' and HEntryID='" + hentryid + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, hentryid);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, int hentryid)
+ {
+ DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_EquipRepairSendWorkBillSub>>(msg3);
+ int i = 1;
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSb_EquipRepairSendWorkBillSub oSub in DetailColl)
+ {
+ oCN.RunProc("Insert into Sb_EquipRepairSendWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + (hentryid==-1?i: hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
+ ") ");
+ i++;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 璁惧缁翠慨娲惧伐鍗� 鍒犻櫎
+ [Route("Sb_EquipRepairSendWorkBill/DeleteWorkBill")]
+ [HttpGet]
+ public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠宸插叧闂�,涓嶈兘鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠宸蹭綔搴�,涓嶈兘鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index 1543437..4fc8ccc 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -253,7 +253,7 @@
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain"+sWhere+ "order by hmainid desc", "h_v_Sc_StationInBillListMain");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -273,58 +273,71 @@
#endregion
#region 鏍囧噯宸ユ椂瀵煎嚭Excel琛ㄦ牸鏁版嵁
- private System.IO.Stream ExcelStream()
- {
- HSSFWorkbook hssfworkbook = new HSSFWorkbook();
- ISheet sheet1 = hssfworkbook.CreateSheet("sheet1");
- IRow row1 = sheet1.CreateRow(0);
- ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
- row1.CreateCell(0).SetCellValue("杩涚珯鐢熶骇璁㈠崟鍙�");
- row1.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
- row1.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
- row1.CreateCell(3).SetCellValue("宸ユ椂");
- row1.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
- row1.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
- row1.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
- row1.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
- row1.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
- row1.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
- row1.CreateCell(10).SetCellValue("鍒跺崟浜�");
- row1.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
- for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
- {
- IRow row = sheet1.CreateRow(i + 1);
- row.CreateCell(0).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鐢熶骇璁㈠崟鍙�"].ToString());
- row.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
- row.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
- row.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
- row.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
- row.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
- row.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
- row.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
- row.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
- row.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
- row.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
- row.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
- }
-
- MemoryStream file = new MemoryStream();
- hssfworkbook.Write(file);
- file.Seek(0, SeekOrigin.Begin);
- return file;
- }
-
[Route("Sc_PackUnionBill/Sc_StationInBillSetExcel")]
[HttpGet]
public HttpResponseMessage Sc_StationInBillSetExcel()
{
- var file = ExcelStream();
- HttpResponseMessage result = new HttpResponseMessage(HttpStatusCode.OK);
- result.Content = new StreamContent(file);
- result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.ms-excel");
- result.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment");
- result.Content.Headers.ContentDisposition.FileName = "鏍囧噯宸ユ椂琛�.xls";
- return result;
+ HSSFWorkbook workbook = new HSSFWorkbook();
+ ISheet sheet = workbook.CreateSheet("sheet1");
+ IRow row = sheet.CreateRow(0);
+
+
+ row.CreateCell(0).SetCellValue("杩涚珯鐢熶骇璁㈠崟鍙�");
+ row.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
+ row.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
+ row.CreateCell(3).SetCellValue("宸ユ椂");
+ row.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
+ row.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
+ row.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
+ row.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
+ row.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
+ row.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
+ row.CreateCell(10).SetCellValue("鍒跺崟浜�");
+ row.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
+ //绮剧‘鎺у埗鍒楀
+ sheet.SetColumnWidth(1, 5000);
+ sheet.SetColumnWidth(2, 5000);
+ sheet.SetColumnWidth(3, 5000);
+ sheet.SetColumnWidth(4, 5000);
+ sheet.SetColumnWidth(5, 5000);
+ sheet.SetColumnWidth(6, 5000);
+ sheet.SetColumnWidth(7, 5000);
+ sheet.SetColumnWidth(8, 5000);
+ sheet.SetColumnWidth(9, 5000);
+ sheet.SetColumnWidth(10, 5000);
+
+ DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ IRow row1 = sheet.CreateRow(i + 1);
+ row1.CreateCell(0).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鐢熶骇璁㈠崟鍙�"].ToString());
+ row1.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
+ row1.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
+ row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
+ row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+ row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+ row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+ row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+ row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+ row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+ row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+ row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+ }
+ System.IO.MemoryStream ms = new System.IO.MemoryStream();
+ workbook.Write(ms);
+ ms.Position = 0;
+
+ var response = new HttpResponseMessage(HttpStatusCode.OK);
+ response.Content = new StreamContent(ms);
+
+ response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+ var fileName = "鏍囧噯宸ユ椂_.xls";
+
+ response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
+ {
+ FileName = System.Web.HttpUtility.UrlEncode(fileName)
+ };
+ return response;
}
#endregion
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 9c96100..d0ea4e9 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -183,10 +183,18 @@
/// <returns></returns>
[Route("Sc_MouldMaintainBill/GetMouldMaintainBillList")]
[HttpGet]
- public object GetMouldMaintainBillList(string sWhere)
+ public object GetMouldMaintainBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_MouldMaintainBillList_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -244,10 +252,18 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList")]
[HttpGet]
- public object GetMouldDotCheckPlanBillList(string sWhere)
+ public object GetMouldDotCheckPlanBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_MouldDotCheckPlanBillList_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -292,11 +308,18 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckBill/GetMouldDotCheckBillList")]
[HttpGet]
- public object GetMouldDotCheckBillList(string sWhere)
+ public object GetMouldDotCheckBillList(string sWhere,string user)
{
try
{
-
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_MouldDotCheckBillList_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -390,10 +413,18 @@
/// <returns></returns>
[Route("Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList")]
[HttpGet]
- public object GetMouldMaintainPlanBillList(string sWhere)
+ public object GetMouldMaintainPlanBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_MouldMaintainPlanBillList_s(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -2212,12 +2243,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldMaintainPlanBill oBill = new DAL.ClsSc_MouldMaintainPlanBill();
List<Model.ClsSc_MouldMaintainPlanBillMain> lsmain = new List<Model.ClsSc_MouldMaintainPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2391,17 +2432,17 @@
/// <returns></returns>
[Route("Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill")]
[HttpGet]
- public object DeltetMouldMaintainPlanBill(string HInterID)
+ public object DeltetMouldMaintainPlanBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -2484,11 +2525,21 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Edit", 1, false, msg5))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2732,8 +2783,17 @@
/// <returns></returns>
[Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
[HttpGet]
- public object DeltetSc_MouldMaintainBill(string HInterID)
+ public object DeltetSc_MouldMaintainBill(string HInterID,string user)
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
@@ -2813,12 +2873,21 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
List<Model.ClsSc_MouldDotCheckBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2987,22 +3056,22 @@
#region [妯″叿鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 妯″叿鐐规璁板綍鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill")]
[HttpGet]
- public object DeltetSc_MouldDotCheckBill(string HInterID)
+ public object DeltetSc_MouldDotCheckBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -3085,12 +3154,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -3265,17 +3344,17 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill")]
[HttpGet]
- public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
+ public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -3426,7 +3505,7 @@
/// <returns></returns>
[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList")]
[HttpPost]
- public object fSaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
+ public object SaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -5245,10 +5324,18 @@
[Route("Sc_MouldLifeChangeBill/GetMouldLifeChangeBill")]
[HttpGet]
- public object GetMouldLifeChangeBill(string sWhere)
+ public object GetMouldLifeChangeBill(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetMouldLifeChangeBill(sWhere);
objJsonResult.code = "1";
@@ -5367,12 +5454,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldLifeChangeBill oBill = new DLL.ClsSc_MouldLifeChangeBill();
List<Model.ClsSc_MouldLifeChangeBillMain> lsmain = new List<Model.ClsSc_MouldLifeChangeBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -5494,17 +5591,17 @@
/// <returns></returns>
[Route("Sc_MouldLifeChangeBill/DeltetMouldLifeChangeBill")]
[HttpGet]
- public object DeltetMouldLifeChangeBill(string HInterID)
+ public object DeltetMouldLifeChangeBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index d7ff4ba..a62889f 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -248,14 +248,15 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //涓嶉渶瑕�
+ //if (oBill.omodel.HChecker != "")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
@@ -313,6 +314,7 @@
return objJsonResult;
}
+
//杞崲id
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
new file mode 100644
index 0000000..59eea65
--- /dev/null
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -0,0 +1,250 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Sc_PckSplitBillController : ApiController
+ {
+ private JsonResult objJsonResult = new JsonResult();
+ public DataSet ds = new DataSet();
+ public double sRelQty = 0;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public WebServer webserver = new WebServer();
+ /// <summary>
+ /// 鎷嗙鍗曟壂鎻忔墭鏉＄爜/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("PackSplitBill/SetPackBarCode_Webs")]
+ [HttpGet]
+ public Object SetPackBarCode_Webs(Int64 sInterID, string sBillNo, string sBillType, string HTBarCode, string sMaker,Int64 HOWNERID)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ //string sExpressNumber = "";
+ WebSoBar = oWebs.get_CheckTypeByPackBarCode_Pack(sInterID, sBillNo, sBillType,HTBarCode,sMaker,HOWNERID,ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ [Route("PackSplitBill/GetBillEntry_TmpList_Pack")]
+ [HttpGet]
+ public object GetBillEntry_TmpList_Pack(Int64 HBillID, string HBillNo, string HBillType)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetBillEntry_TmpList_Pack(HBillID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鎷嗙鍗曟壂鎻忔媶绠辨潯鐮�/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("PackSplit/get_CheckTypeByBarCode_Json")]
+ [HttpGet]
+ public Object get_CheckTypeByBarCode_Json(string HBarCode,Int64 sInterID, string HBillType, string sBillNo, string HTBarCode, string sMaker, Int64 HOWNERID)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.get_CheckTypeByBarCode_PackSplit(HBarCode, sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+ [Route("PackSplit/Delete")]
+ [HttpGet]
+ public object Delete(long HInterID, string HBarCode,string HBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (DeletePackSplitBill(HInterID, HBarCode, HBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+ public bool DeletePackSplitBill(long HInterID, string HBarCode, string HBillType, ref string sErrMsg)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+
+ if (oWebs.set_DelPonderationBillMain_Temp_Pack(HInterID, HBarCode, HBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍒犻櫎澶辫触锛�";
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 鐢熸垚鎷嗙鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("PackSplit/set_SavePackSplitBill_Json")]
+ [HttpPost]
+ public Object set_SavePackSplitBill_Json(long sInterID, string HBillType, string sBillNo,string HTBarCode,string sMaker,long HOWNERID, ref string sErrMsg)
+ {
+ try
+ {
+
+ if (set_SavePackSplitBill_New(sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public bool set_SavePackSplitBill_New(long sInterID, string HBillType, string sBillNo, string HTBarCode, string sMaker, long HOWNERID, ref string sErrMsg)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SavePackSplitBill_New(sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref sErrMsg))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + sBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + sBillNo + ", 鍗曟嵁ID锛�" + sInterID + ";" + sErrMsg;
+ return false;
+ }
+ }
+
+ }
+}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 658fac7..8f1878c 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -6,6 +6,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.DLL;
using WebAPI.Models;
using WebAPI.Service;
@@ -16,6 +17,10 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
///<summary>
///灏佽鐘舵�佺爜鍙婅繑鍥炰俊鎭殑鍏敤鏂规硶銆�
@@ -218,6 +223,12 @@
return GetObjectJson(ds);
}
+ #region 宸ュ簭璁″垝鍗�
+ List<ClsSc_ProcessPlanSub> DetailColl = new List<ClsSc_ProcessPlanSub>();
+ ClsSc_ProcessPlanMain omodel = new ClsSc_ProcessPlanMain();
+ ClsSc_ProcessPlan oBill = new ClsSc_ProcessPlan();
+
+ #region 宸ュ簭璁″垝鍗曞垪琛�
/// <summary>
/// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -252,12 +263,415 @@
}
return GetObjectJson(ds);
}
+ #endregion
- /// <summary>
- /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
+ #region 淇濆瓨/缂栬緫
+ //宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
+ [Route("Sc_ProcessMangement/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ try
+ {
+ omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_ProcessPlanMain>(msg2);
+ string BillType = "3715";
+
+
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_ProcessPlanMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID" +
+ ",HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID" +
+ ",HICMOInterID,HICMOBillNo,HMaterID,HMaterNumber,HUnitID" +
+ ",HUnitNumber,HPlanQty,HPlanBeginDate,HPlanEndDate,HExplanation" +
+ ",HRemark,HInnerBillNo,HMaker,HMakeDate" +
+ ") " +
+ " values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + (omodel.HBillStatus=1) + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
+ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() +
+ ",'" + omodel.HUnitNumber + "'," + omodel.HPlanQty.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HExplanation + "'" +
+ ",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + omodel.HMaker + "',getdate()" +
+ ") ");
+ }
+ else if (OperationType == 3)
+ {
+ //淇敼
+ oCN.RunProc("UpDate Sc_ProcessPlanMain set " +
+ " HYear=" + omodel.HYear.ToString() +
+ ",HPeriod=" + omodel.HPeriod.ToString() +
+ //",HInterID=" + omodel.HInterID.ToString() +
+ ",HDate='" + omodel.HDate.ToShortDateString() + "'" +
+ //",HBillNo='" + omodel.HBillNo + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HCheckItemNowID=" + omodel.HCheckItemNowID.ToString() +
+ ",HCheckItemNextID=" + omodel.HCheckItemNextID.ToString() +
+ ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HUnitID=" + omodel.HUnitID.ToString() +
+ ",HUnitNumber='" + omodel.HUnitNumber + "'" +
+ ",HPlanQty=" + omodel.HPlanQty.ToString() +
+ ",HPlanBeginDate='" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",HPlanEndDate='" + omodel.HPlanEndDate.ToShortDateString() + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
+ ",HUpDateDate=getdate()" +
+ " where HInterID=" + omodel.HInterID.ToString());
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString()+ " and hentryid="+ hentryid);
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, hentryid);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, int hentryid)
+ {
+ DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ProcessPlanSub>>(msg3);
+ int i = 1;
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSc_ProcessPlanSub oSub in DetailColl)
+ {
+ oCN.RunProc("Insert into Sc_ProcessPlanSub " +
+ " (HInterID,HEntryID,HBillNo,HProcNo,HProcID,HWorkingQty" +
+ ",HProcNumber,HWorkRemark,HCenterID,HDeptID,HDeptNumber" +
+ ",HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate" +
+ ",HICMOInterID,HICMOBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HCloseMan,HCloseType,HRemark,HSourceInterID,HSourceEntryID" +
+ ",HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HBeginDayQty,HBeginFixQty,HFixWorkDays,HTrunWorkDays,HReadyTimes" +
+ ",HReadyTime,HQueueTime,HMoveTime,HBatchNo" +
+ ") values("
+ + omodel.HInterID.ToString() + "," +(hentryid==-1?i: hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
+ ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" +
+ "," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
+ "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate.ToString() + "','" + oSub.HPlanEndDate.ToString() + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + ",'" + oSub.HBatchNo + "'" +
+ ") ");
+ i++;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 瀹℃牳/鍙嶅鏍�
+ [Route("Sc_ProcessMangement/CheckDeOAuditBill")]
+ [HttpGet]
+ public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ // string ModRightNameCheck = ""; 璇ユā鍧楃殑瀹℃牳鍔熻兘
+ DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
+
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鍒ゆ柇id鏄惁澶т簬0
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ID灏忎簬0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杞崲id
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+
+ //鏌ヨ瀹℃牳鐨勮繖鏉℃暟鎹�
+ ds = oCN.RunProcReturn("select * from Sc_ProcessPlanMain where HInterID='" + HInterID + "'", "Sc_ProcessPlanMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ string HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();//鍏抽棴浜�
+ string HDeleteMan = ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();//浣滃簾浜�
+ string HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();//瀹℃牳浜�
+
+ if (HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,涓嶈兘瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HDeleteMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,涓嶈兘瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //IsAudit==0 瀹℃牳
+ if (IsAudit == 0)
+ {
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鏁版嵁宸插鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //IsAudit==1 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ if (HChecker == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鏁版嵁鏈鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:"+DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (IsAudit == 0)
+ {
+ if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍告彁浜�
+ if (IsAudit == 1)
+ {
+ if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sc_ProcessPlanMain set HChecker='" + HChecker + "',HCheckDate='" + DateTime.Now + "',HBillStatus=2 where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "瀹℃牳鍗曟嵁鎴愬姛!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sc_ProcessPlanMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔�!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎
+ [Route("Sc_ProcessMangement/DeleteProcessBill")]
+ [HttpGet]
+ public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //涓嶉渶瑕�
+ //if (oBill.omodel.HChecker != "")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
[Route("Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json")]
[HttpGet]
public object MES_Sc_ProcessSendWorkMain_Json(string sWhere)
diff --git a/WebAPI/DLL/ClsSb_EquipRepairSendWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairSendWorkBill.cs
new file mode 100644
index 0000000..facd0be
--- /dev/null
+++ b/WebAPI/DLL/ClsSb_EquipRepairSendWorkBill.cs
@@ -0,0 +1,229 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSb_EquipRepairSendWorkBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSb_EquipRepairSendWorkBillMain omodel = new Models.ClsSb_EquipRepairSendWorkBillMain();
+ public List<Models.ClsSb_EquipRepairSendWorkBillSub> DetailColl = new List<Models.ClsSb_EquipRepairSendWorkBillSub>();
+
+ public ClsSb_EquipRepairSendWorkBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipRepairSendWorkBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipRepairSendWorkBillMain";
+ base.MvarReportTitle = "璁惧缁翠慨娲惧伐鍗�";
+ base.BillType = "3909";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipRepairSendWorkBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipRepairSendWorkBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //=========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HRepairID=" + omodel.HRepairID.ToString() +
+ ",HPlanTimes=" + omodel.HPlanTimes.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HRepairPlanBeginDate='" + omodel.HRepairPlanBeginDate + "'" +
+ ",HRepairPlanEndDate='" + omodel.HRepairPlanEndDate + "'" +
+ ",HRepairContent='" + omodel.HRepairContent + "'" +
+ ",HCycleUnit='" + omodel.HCycleUnit + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ //DeleteRelation(ref sReturn, lngBillKey);
+ ////鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ ////鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsSb_EquipRepairSendWorkBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairSendWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
+ ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipRepairSendWorkBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HExplanation,HInnerBillNo,HRepairID,HEmpID" +
+ ",HManagerID,HDeptID,HRepairContent,HRepairPlanBeginDate,HRepairPlanEndDate" +
+ ",HPlanTimes,HCycleUnit" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HRepairID.ToString() + "," + omodel.HEmpID.ToString() +
+ "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairContent + "','" + omodel.HRepairPlanBeginDate + "','" + omodel.HRepairPlanEndDate + "'" +
+ "," + omodel.HPlanTimes.ToString() + ",'" + omodel.HCycleUnit + "'" +
+ ") ");
+ ////鎻掑叆瀛愯〃
+ foreach (Models.ClsSb_EquipRepairSendWorkBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairSendWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Sb_EquipRepairSendWorkBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipRepairSendWorkBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //璧嬪��
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //=======================================
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HRepairID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HRepairID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HPlanTimes = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPlanTimes"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HRepairPlanBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HRepairPlanBeginDate"]);
+ omodel.HRepairPlanEndDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HRepairPlanEndDate"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HRepairContent = Ds.Tables[0].Rows[0]["HRepairContent"].ToString().Trim();
+ omodel.HCycleUnit = Ds.Tables[0].Rows[0]["HCycleUnit"].ToString().Trim();
+ omodel.HExplanation = Ds.Tables[0].Rows[0]["HExplanation"].ToString().Trim();
+ omodel.HInnerBillNo = Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString().Trim();
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipRepairSendWorkBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipRepairSendWorkBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsSb_EquipRepairSendWorkBillSub oSub = new Models.ClsSb_EquipRepairSendWorkBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===========================================
+ oSub.HRepairID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
+ oSub.HRepairExplanation = DsSub.Tables[0].Rows[i]["HRepairExplanation"].ToString().Trim();
+ oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSc_ProcessPlan.cs b/WebAPI/DLL/ClsSc_ProcessPlan.cs
new file mode 100644
index 0000000..059a1d7
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_ProcessPlan.cs
@@ -0,0 +1,291 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSc_ProcessPlan:DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSc_ProcessPlanMain omodel = new Models.ClsSc_ProcessPlanMain();
+ public List<Models.ClsSc_ProcessPlanSub> DetailColl = new List<Models.ClsSc_ProcessPlanSub>();
+
+ public ClsSc_ProcessPlan()
+ {
+ base.MvarItemKeySub = "Sc_ProcessPlanSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Sc_ProcessPlanMain";
+ base.MvarReportTitle="宸ュ簭璁″垝鍗�";
+ base.BillType="3715";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_ProcessPlan()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //鍒犻櫎
+ public bool DeleteBill2(Int64 lngBillKey, ref string sReturn)
+ {
+ oK3Cn.RunProc("update ICMO set FCardClosed=1059 where finterid=" + lngBillKey.ToString());
+ return true;
+ }
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_ProcessPlanMain set " +
+ " HYear=" + omodel.HYear.ToString() +
+ ",HPeriod=" + omodel.HPeriod.ToString() +
+ ",HInterID=" + omodel.HInterID.ToString() +
+ ",HDate='" + omodel.HDate.ToShortDateString() + "'" +
+ ",HBillNo='" + omodel.HBillNo + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HCheckItemNowID=" + omodel.HCheckItemNowID.ToString() +
+ ",HCheckItemNextID=" + omodel.HCheckItemNextID.ToString() +
+ ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HUnitID=" + omodel.HUnitID.ToString() +
+ ",HUnitNumber='" + omodel.HUnitNumber + "'" +
+ ",HPlanQty=" + omodel.HPlanQty.ToString() +
+ ",HPlanBeginDate='" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",HPlanEndDate='" + omodel.HPlanEndDate.ToShortDateString() + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsSc_ProcessPlanSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_ProcessPlanSub " +
+ " (HInterID,HEntryID,HBillNo,HProcNo,HProcID,HWorkingQty" +
+ ",HProcNumber,HWorkRemark,HCenterID,HDeptID,HDeptNumber" +
+ ",HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate" +
+ ",HICMOInterID,HICMOBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HCloseMan,HCloseType,HRemark,HSourceInterID,HSourceEntryID" +
+ ",HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HBeginDayQty,HBeginFixQty,HFixWorkDays,HTrunWorkDays,HReadyTimes" +
+ ",HReadyTime,HQueueTime,HMoveTime,HBatchNo" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
+ ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" +
+ "," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
+ "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate + "','" + oSub.HPlanEndDate +"'"+
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo +"'"+
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) +",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + ",'" + oSub.HBatchNo + "'" +
+ ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sc_ProcessPlanMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID" +
+ ",HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID" +
+ ",HICMOInterID,HICMOBillNo,HMaterID,HMaterNumber,HUnitID" +
+ ",HUnitNumber,HPlanQty,HPlanBeginDate,HPlanEndDate,HExplanation" +
+ ",HRemark,HInnerBillNo,HMaker,HMakeDate" +
+ ") " +
+ " values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
+ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() +
+ ",'" + omodel.HUnitNumber + "'," + omodel.HPlanQty.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HExplanation +"'"+
+ ",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSc_ProcessPlanSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_ProcessPlanSub " +
+ " (HInterID,HEntryID,HBillNo,HProcNo,HProcID,HWorkingQty" +
+ ",HProcNumber,HWorkRemark,HCenterID,HDeptID,HDeptNumber" +
+ ",HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate" +
+ ",HICMOInterID,HICMOBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HCloseMan,HCloseType,HRemark,HSourceInterID,HSourceEntryID" +
+ ",HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HBeginDayQty,HBeginFixQty,HFixWorkDays,HTrunWorkDays,HReadyTimes" +
+ ",HReadyTime,HQueueTime,HMoveTime,HBatchNo" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
+ ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" +
+ "," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
+ "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate + "','" + oSub.HPlanEndDate + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + ",'" +oSub.HBatchNo + "'" +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Sc_ProcessPlanMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcessPlanMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //璧嬪��
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ //
+ omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]);
+ omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HMaterNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber"]);
+ omodel.HUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HUnitID"]);
+ omodel.HUnitNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUnitNumber"]);
+ omodel.HPlanQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPlanQty"]);
+ omodel.HPlanBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HPlanBeginDate"]);
+ omodel.HPlanEndDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HPlanEndDate"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ //
+ omodel.HBacker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBacker"]);
+ omodel.HBackDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackDate"]);
+ omodel.HChecker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HChecker"]);
+ omodel.HCheckDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckDate"]);
+ omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+ omodel.HUpDateDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDateDate"]);
+ omodel.HCloseMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseMan"]);
+ omodel.HCloseDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseDate"]);
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteMan"]);
+ omodel.HDeleteDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteDate"]);
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Sc_ProcessPlanSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_ProcessPlanSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsSc_ProcessPlanSub oSub = new Models.ClsSc_ProcessPlanSub();
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ //
+ oSub.HBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
+ oSub.HProcNo = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcNo"]);
+ oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]);
+ oSub.HProcNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcNumber"]);
+ oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWorkRemark"]);
+ oSub.HCenterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCenterID"]);
+ oSub.HDeptID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HDeptID"]);
+ oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDeptNumber"]);
+ oSub.HGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HGroupID"]);
+ oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HGroupNumber"]);
+ oSub.HWorkerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWorkerID"]);
+ oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWorkerNumber"]);
+ oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTimeUnit"]);
+ oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPlanWorkTimes"]);
+ oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HPlanBeginDate"]);
+ oSub.HPlanEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HPlanEndDate"]);
+ oSub.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]);
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HWorkingQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HWorkingQty"]);
+ //
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillNo"]);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HBeginDayQty"]);
+ oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HBeginFixQty"]);
+ oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HFixWorkDays"]);
+ oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HTrunWorkDays"]);
+ oSub.HReadyTimes = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HReadyTimes"]);
+ oSub.HReadyTime = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HReadyTime"]);
+ oSub.HQueueTime = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HQueueTime"]);
+ oSub.HMoveTime = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HMoveTime"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+
+
+ }
+
+}
diff --git a/WebAPI/Models/ClsSb_EquipRepairSendWorkBillMain.cs b/WebAPI/Models/ClsSb_EquipRepairSendWorkBillMain.cs
new file mode 100644
index 0000000..209894b
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairSendWorkBillMain.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairSendWorkBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HEquipID;
+ public Int64 HRepairID;
+ public Int64 HPlanTimes;
+ public DateTime HRepairPlanBeginDate;
+ public DateTime HRepairPlanEndDate;
+ public Int64 HEmpID;
+ public Int64 HManagerID;
+ public Int64 HDeptID;
+ public string HCycleUnit;
+ public string HRepairContent;
+ public string HExplanation;
+ public string HInnerBillNo;
+
+ }
+}
diff --git a/WebAPI/Models/ClsSb_EquipRepairSendWorkBillSub.cs b/WebAPI/Models/ClsSb_EquipRepairSendWorkBillSub.cs
new file mode 100644
index 0000000..a3dde88
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairSendWorkBillSub.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairSendWorkBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ //============
+ public Int64 HRepairID;
+ public string HRepairExplanation;
+ public Int64 HManagerID;
+
+
+ }
+}
diff --git a/WebAPI/Models/ClsSc_ProcessPlanMain.cs b/WebAPI/Models/ClsSc_ProcessPlanMain.cs
new file mode 100644
index 0000000..dcfd6b6
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessPlanMain.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessPlanMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public string HBillSubType;// varchar(10) --类型(普通)
+ public Int64 HCheckItemNowID;// int --当前审核项目（默认值 0）
+ public Int64 HCheckItemNextID;// int --待审核项目（默认值 0）
+ public Int64 HICMOInterID;// int --任务单ID（界面不显示）
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HMaterID;// int --产品ID
+ public string HMaterNumber;// varchar(100) --产品代码
+ public Int64 HUnitID;// int --单位ID
+ public string HUnitNumber;// varchar(50) --单位代码
+ public double HPlanQty;// dec(18,8) --生产数量
+ public DateTime HPlanBeginDate;// datetime --计划开工日期
+ public DateTime HPlanEndDate;// datetime --计划完工日期
+ public string HExplanation;// varchar(500) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public bool HCloseType;// bit --关闭类型 （默认为0）
+
+
+ public int HWorkerID;
+ public int HProcNo;
+ public int HProcID;
+ public int HGroupID;
+ public int HDeptID;
+ public int HQty;
+ public int HSourceInterID;// int --源单内码
+ public int HSourceEntryID;// int --源单子内码
+ public string HSourceBillNo;// varchar(50) --源单号
+ public string HSourceBillType;// varchar(10) --源单类型
+ public int HSourceID;
+ }
+}
diff --git a/WebAPI/Models/ClsSc_ProcessPlanSub.cs b/WebAPI/Models/ClsSc_ProcessPlanSub.cs
new file mode 100644
index 0000000..75cd335
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessPlanSub.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessPlanSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo;// varchar(50) --工序计划单号（不可编辑，自动生成）
+ public Int64 HProcNo;// int --工序号
+ public Int64 HProcID;// int --工序
+ public string HProcNumber;// varchar(50) --工序代码
+ public string HWorkRemark;// varchar(200) --加工说明
+ public Int64 HCenterID;// int --工作中心ID
+ public Int64 HDeptID;// int --加工车间（部门ID）
+ public string HDeptNumber;// varchar(50) --加工车间代码（部门代码）
+ public Int64 HGroupID;// int --班组ID
+ public string HGroupNumber;// varchar(50) --班组代码
+ public Int64 HWorkerID;// int --操作工ID
+ public string HWorkerNumber;// varchar(50) --操作工代码
+ public Int64 HSourceID;// int --生产资源ID
+ public double HQty;// dec(18,8) --计划数量
+ public string HTimeUnit;// varchar(50) --时间单位（小时,分钟）
+ public Single HPlanWorkTimes;// money --工序计划加工时间
+ public DateTime? HPlanBeginDate;// datetime --工序计划开工日期
+ public DateTime? HPlanEndDate;// datetime --计划完工日期
+ public Int64 HICMOInterID;// int --任务单ID
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HSeOrderInterID;// int --销售订单主ID
+ public Int64 HSeOrderEntryID;// int --销售子ID
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HRemark;// --备注
+ public string HBatchNo;// --
+ public double HWorkingQty;
+ //新增
+ public Single HBeginDayQty; //money --开工余量（天数) addnew
+ public Single HBeginFixQty; //money --开工余量（固数） addnew
+ public Single HFixWorkDays; //money --上道固定天数 addnew
+ public Single HTrunWorkDays; //money --上道循环周期(暂不用) addnew
+ public Single HReadyTimes; //money --本道准备时间(暂不用) addnew
+ public Single HReadyTime; //money --准备时间（ 默认为0） addnew
+ public Single HQueueTime; //money --排队时间（ 默认为0） addnew
+ public Single HMoveTime; //money --转移时间（ 默认为0） addnew
+ }
+}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8b72bc5..df73b21 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -354,6 +354,7 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
@@ -478,6 +479,7 @@
<Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
<Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
<Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" />
<Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -493,6 +495,7 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
@@ -501,10 +504,14 @@
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillSub.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\ClsSc_ProcessPlanMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessPlanSub.cs" />
<Compile Include="Models\ClsSc_ProcessReportMain.cs" />
<Compile Include="Models\ClsSc_ProcessReportSub.cs" />
<Compile Include="Models\ClsWW_PPBomBillMain.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3179f3..16d95e2 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>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1