From 992c1b2a44134896ddbe9941307959c2b9d022e3 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 01 十二月 2023 15:21:09 +0800
Subject: [PATCH] 1
---
WarM/条码打印/Kf_WeighToBarCode.designer.cs | 87 +++++++---
DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs | 3
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | 38 ++++
WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs | 105 +++++++++++++
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 4
WebAPI/Controllers/POStockInBillController.cs | 3
WarM/条码打印/Kf_WeighToBarCode.cs | 1
WebAPI/Controllers/MateOutController.cs | 3
WebAPI/Web.config | 3
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 48 ++++++
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillMain.cs | 3
WebAPI/Controllers/Sc_ProcessMangementController.cs | 142 +++++++++++++++++
WebAPI/WebAPI.csproj | 1
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs | 3
14 files changed, 412 insertions(+), 32 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
index c644ef5..9f6ec45 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
@@ -137,6 +137,9 @@
"'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
") ");
}
+ //鐐规瀹屾垚锛屽弽鍐欒澶囩偣妫�璁″垝鍗曞瓙琛ㄦ槸鍚︾偣妫�鏍囪
+ oCn.RunProc("exec h_p_Sb_EquipDotCheck_AfterSaveCtrl " + omodel.HEquipDotCheckPlanInterID + "," + omodel.HEquipDotCheckPlanEntryID);
+
//
//foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
//{
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
index 78cf638..f6c656d 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
@@ -162,6 +162,10 @@
"'" +
") ");
}
+
+ //淇濆吇瀹屾垚锛屽弽鍐欒澶囦繚鍏昏鍒掑崟瀛愯〃鏄惁鐐规鏍囪
+ oCn.RunProc("exec h_p_Sb_EquipMaintain_AfterSaveCtrl " + omodel.HEquipMaintainPlanInterID + "," + omodel.HEquipMaintainPlanEntryID);
+
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillMain.cs"
index 04f336a..af51b09 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillMain.cs"
@@ -16,7 +16,8 @@
public int HEquipMaintainRuleInterID;
public int HEquipDotCheckRuleInterID;
-
+ public int HEquipDotCheckPlanInterID; //设备点检计划单（Sb_EquipDotCheckPlanBillSub_Plan）主内码
+ public int HEquipDotCheckPlanEntryID; //设备点检计划单（Sb_EquipDotCheckPlanBillSub_Plan）子内码
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
index e070588..50fc8c8 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
@@ -15,6 +15,7 @@
public Int64 HDeptID;
public int HEquipMaintainRuleInterID;
-
+ public int HEquipMaintainPlanInterID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）主内码
+ public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index c0fcab3..42fd702 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -795,6 +795,7 @@
HProcessExchangeInterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("ProcessExchangeInterID")].Value);
HSupID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSupID")].Value);
HMaterWeight = DBUtility.ClsPub.isDoule(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterWeight")].Value);
+ txtHOrderPickRemark.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("璁㈠崟鍖呰澶囨敞")].Value);
}
//杩斿洖婧愬崟鍒楄〃淇℃伅
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
index df54f15..8a4dd02 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -98,6 +98,8 @@
this.涓棿 = new System.Windows.Forms.Panel();
this.搴曢儴 = new System.Windows.Forms.Panel();
this.鍙充晶 = new System.Windows.Forms.Panel();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHOrderPickRemark = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -270,14 +272,14 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle5;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -285,7 +287,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1091, 377);
+ this.grdMain.Size = new System.Drawing.Size(1091, 334);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
@@ -354,6 +356,8 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.label17);
+ this.gbUp.Controls.Add(this.txtHOrderPickRemark);
this.gbUp.Controls.Add(this.label15);
this.gbUp.Controls.Add(this.txtHCusModel);
this.gbUp.Controls.Add(this.label16);
@@ -393,7 +397,7 @@
this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
this.gbUp.Location = new System.Drawing.Point(0, 0);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1105, 218);
+ this.gbUp.Size = new System.Drawing.Size(1105, 261);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -474,7 +478,7 @@
// chkHDYFlag
//
this.chkHDYFlag.AutoSize = true;
- this.chkHDYFlag.Location = new System.Drawing.Point(558, 188);
+ this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
this.chkHDYFlag.Name = "chkHDYFlag";
this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
@@ -486,7 +490,7 @@
//
this.cmdFZF.BackColor = System.Drawing.Color.White;
this.cmdFZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdFZF.Location = new System.Drawing.Point(729, 174);
+ this.cmdFZF.Location = new System.Drawing.Point(729, 222);
this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
this.cmdFZF.Name = "cmdFZF";
this.cmdFZF.Size = new System.Drawing.Size(86, 32);
@@ -499,7 +503,7 @@
//
this.cmdZF.BackColor = System.Drawing.Color.White;
this.cmdZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdZF.Location = new System.Drawing.Point(635, 174);
+ this.cmdZF.Location = new System.Drawing.Point(635, 222);
this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
this.cmdZF.Name = "cmdZF";
this.cmdZF.Size = new System.Drawing.Size(86, 32);
@@ -635,7 +639,7 @@
//
this.cmdSave.BackColor = System.Drawing.Color.White;
this.cmdSave.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdSave.Location = new System.Drawing.Point(209, 174);
+ this.cmdSave.Location = new System.Drawing.Point(209, 222);
this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
this.cmdSave.Name = "cmdSave";
this.cmdSave.Size = new System.Drawing.Size(86, 32);
@@ -659,7 +663,7 @@
//
this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
this.cmdSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 174);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
@@ -728,14 +732,14 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle6;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.Location = new System.Drawing.Point(0, 73);
this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -751,10 +755,10 @@
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 218);
+ this.tabControl1.Location = new System.Drawing.Point(0, 261);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1105, 409);
+ this.tabControl1.Size = new System.Drawing.Size(1105, 366);
this.tabControl1.TabIndex = 149;
//
// tabPage1
@@ -763,7 +767,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1097, 383);
+ this.tabPage1.Size = new System.Drawing.Size(1097, 340);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "绉伴噸璁板綍";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -867,6 +871,31 @@
this.鍙充晶.Size = new System.Drawing.Size(12, 627);
this.鍙充晶.TabIndex = 64;
//
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(15, 177);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(77, 12);
+ this.label17.TabIndex = 324;
+ this.label17.Text = "璁㈠崟鍖呰澶囨敞";
+ //
+ // txtHOrderPickRemark
+ //
+ this.txtHOrderPickRemark.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHOrderPickRemark.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHOrderPickRemark.ForeColor = System.Drawing.Color.Red;
+ this.txtHOrderPickRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHOrderPickRemark.Location = new System.Drawing.Point(95, 173);
+ this.txtHOrderPickRemark.Multiline = true;
+ this.txtHOrderPickRemark.Name = "txtHOrderPickRemark";
+ this.txtHOrderPickRemark.ReadOnly = true;
+ this.txtHOrderPickRemark.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtHOrderPickRemark.Size = new System.Drawing.Size(726, 44);
+ this.txtHOrderPickRemark.TabIndex = 325;
+ //
// Kf_WeighToBarCode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -968,5 +997,7 @@
private System.Windows.Forms.TextBox txtHCusModel;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.TextBox txtHCusMaterName;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHOrderPickRemark;
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index f5f8a03..858190a 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -2076,6 +2076,7 @@
public string HProductName { get; set; }
public string HOtherSearch { get; set; }
public string HEmpName { get; set; }
+ public string sWheres { get; set; }
}
[Route("MaterOutEntryReport/SC_DayRkReport")]
[HttpGet]
@@ -2086,7 +2087,7 @@
DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
- $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}'";
+ $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'";
//string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
// $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 923ccbe..8c671f1 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -4439,6 +4439,7 @@
jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());
jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());
jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());
+ jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//鏄惁璧犲搧
//jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());
//jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());
//jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());
@@ -5060,6 +5061,7 @@
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+,C.FGIVEAWAY AS FGIVEAWAY
FROM CG_POINSTOCKBILLSUB B
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -5143,6 +5145,7 @@
FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+ FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//鏄惁璧犲搧
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
index 54dbcbe..fb4bde5 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -355,6 +355,44 @@
}
#endregion
+ #region[璁惧鐐规璁板綍琛紝閫夌偣妫�璁″垝鑾峰彇鐐规璁″垝娓呭崟淇℃伅]
+ [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList")]
+ [HttpGet]
+ public object Sb_EquipDotCheckPlanBill_PlanList(string HInterID,string HDate)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheck_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipDotCheck_GetPlanList");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹俊鎭紒";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙戠敓寮傚父锛屾病鏈夎繑鍥炰换浣曡鍒掞紒" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region[璁惧鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁--鐐规璁″垝]
[Route("Sb_EquipDotCheckPlanBill/GetPlanList")]
[HttpGet]
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index f845d74..6455b57 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -413,6 +413,54 @@
}
#endregion
+ #region[璁惧淇濆吇璁板綍琛紝閫変繚鍏昏鍒掕幏鍙栦繚鍏昏鍒掓竻鍗曚俊鎭痌
+ [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList")]
+ [HttpGet]
+ public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate)
+ {
+ DataSet ds,ds1;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ List<DataTable> tableList = new List<DataTable>();
+
+ //鑾峰彇淇濆吇椤圭洰
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMaintain_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipMaintain_GetPlanList");
+
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 and hmainid = " + HInterID;
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
+
+ tableList.Add(ds.Tables[0]);
+ tableList.Add(ds1.Tables[0]);
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = tableList;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹俊鎭紒";
+ objJsonResult.data = tableList;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙戠敓寮傚父锛屾病鏈夎繑鍥炰换浣曡鍒掞紒" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁--淇濆吇璁″垝]
[Route("Sb_EquipMaintainPlanBill/GetPlanList")]
[HttpGet]
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs
new file mode 100644
index 0000000..d661839
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs
@@ -0,0 +1,105 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web.Http;
+using WebAPI.DLL;
+using WebAPI.Models;
+using WebAPI.Service;
+using Kingdee.BOS.WebApi.Client;
+
+namespace WebAPI.Controllers
+{
+ public class Sc_ICMOBillWorkQtyStatus_TmpController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 璁惧浜ч噺閲囬泦鍒楄〃
+ [Route("Sc_ICMOBillWorkQtyStatus_Tmp/Sc_ICMOBillWorkQtyStatus_TmpList")]
+ [HttpGet]
+ public object Sc_ICMOBillWorkQtyStatus_TmpList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from Sc_ICMOBillWorkQtyStatus_TmpList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 閲囬泦鏃堕棿 desc";
+ ds = oCN.RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_TmpList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧浜ч噺閲囬泦鍒楄〃
+ [Route("Sc_ICMOBillQualityStatus_Tmp/Sc_ICMOBillQualityStatus_TmpList")]
+ [HttpGet]
+ public object Sc_ICMOBillQualityStatus_TmpList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from Sc_ICMOBillQualityStatus_TmpList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "Sc_ICMOBillQualityStatus_TmpList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 1b817d4..e835f1e 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -394,6 +394,83 @@
//}
#endregion
+
+
+ /// <summary>
+ /// 鍏ュ簱鈥斺�旂敓浜ф眹鎶ュ崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/SaveICMOReportBill_Batch")]
+ [HttpPost]
+ public object SaveICMOReportBill_Batch([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string InterID = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string BillNo = sArray[2].ToString();
+ string OrganizationID = sArray[3].ToString();
+ ArrayList InterIDArray = new ArrayList(InterID.Split(','));
+ ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
+ try
+ {
+ string bResult;
+ string HMessage = "";
+ string HSuccessBillNo = "";
+ string HFailBillNo = "";
+ WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();
+ if (InterIDArray.Count != BillNoArray.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁涓嶅畬鏁达紝鍐呯爜鏁伴噺涓嶇瓑浜庡崟鎹彿鏁伴噺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ for (int i = 0; i < InterIDArray.Count;i++)
+ {
+ bResult = JsonConvert.SerializeObject(oBill.SaveICMOReportBill(InterIDArray[i].ToString(), user, BillNoArray[i].ToString(), OrganizationID));
+
+ //鍙嶅簭鍒楀寲
+ bResult = "[" + bResult.ToString() + "]";
+
+ List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);
+
+ if (list[0].count == 1)
+ {
+ HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString()+"," + "\r\n" ;
+ }
+ else
+ {
+ HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
+ }
+ HMessage = "姹囨姤鎴愬姛鍗曞彿锛�" + HSuccessBillNo + "\r\n" + " 姹囨姤澶辫触鍗曞彿锛�" + HFailBillNo;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = HMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
/// <summary>
/// 鍏ュ簱鈥斺�旂敓浜ф眹鎶ュ崟
/// </summary>
@@ -613,6 +690,71 @@
}
}
+ /// <summary>
+ /// 鍏ュ簱鈥斺�旂敓浜ф眹鎶ュ崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/SaveProcdutInBill_Batch")]
+ [HttpPost]
+ public object SaveProcdutInBill_Batch([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string BillNo = sArray[0].ToString();
+ BillNo = BillNo.Replace("\r\n", "").Replace("[ ", "").Replace("]", "");
+ BillNo = BillNo.Replace("\\", "").Replace("\n", "").Replace("\"", "");
+ BillNo = BillNo.Trim();
+ ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
+
+ try
+ {
+ string bResult;
+ string HMessage = "";
+ string HSuccessBillNo = "";
+ string HFailBillNo = "";
+ WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();
+
+ for (int i = 0; i < BillNoArray.Count; i++)
+ {
+ bResult = JsonConvert.SerializeObject(oBill.SaveProcdutInBill(BillNoArray[i].ToString().Trim()));
+
+ //鍙嶅簭鍒楀寲
+ bResult = "[" + bResult.ToString() + "]";
+
+ List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);
+
+ if (list[0].count == 1)
+ {
+ HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString() + "," + "\r\n";
+ }
+ else
+ {
+ HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
+ }
+ HMessage = "鍏ュ簱鎴愬姛鍗曞彿锛�" + HSuccessBillNo + "\r\n" + " 鍏ュ簱澶辫触鍗曞彿锛�" + HFailBillNo;
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = HMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鍏ュ簱鈥斺�斾骇鍝佸叆搴撳崟
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 7247c9d..f87d027 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -51,8 +51,9 @@
</system.Web>
-->
<system.web>
+ <customErrors mode="Off"/>
<compilation debug="true" targetFramework="4.5" />
- <httpRuntime />
+ <httpRuntime maxQueryStringLength="102400" />
<pages controlRenderingCompatibilityVersion="4.0" />
</system.web>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5921c79..d84a49d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -425,6 +425,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
<Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
--
Gitblit v1.9.1