From 098d529e0d74efd131ec2c70df59b84abb336da7 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 七月 2022 08:28:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Sc_MouldProdInBill/Log/637933914348556956.log | 3
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 153 +-------
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 9
WebAPI/Sc_MouldProdInBill/Log/637933914350477009.log | 3
WebAPI/Controllers/工资管理/Pay_PieceRateWageReportController.cs | 104 ++++++
WarM/条码打印/Gy_BarCodeBill.cs | 6
WebAPI/Controllers/工资管理/Pay_MonthlySalaryReportController.cs | 103 ++++++
WebAPI/Vlog/webapi20220714.txt | 5
WebAPI/Models/动态列/OptionListModel.cs | 16 +
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8
WebAPI/Sc_MouldProdInBill/Log/637933921056113939.log | 3
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 32 +-
WebAPI/Controllers/Sc_PckSplitBillController.cs | 77 ++++
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 136 +++++--
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 107 ++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
WebAPI/Sc_MouldProdInBill/Log/637933921042282724.log | 3
WebAPI/Sc_MouldProdOutBill/Log/637933914368426726.log | 3
WebAPI/Sc_MouldProdInBill/Log/637933921055483894.log | 3
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 63 +++
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 22 +
WebAPI/Sc_MouldProdInBill/Log/637933921048423377.log | 3
WarM/条码打印/Gy_BarCodeBill.designer.cs | 31 +
WebAPI/Controllers/Sc_ProcessMangementController.cs | 6
WebAPI/Sc_MouldProdInBill/Log/637933921048453385.log | 3
WebAPI/Sc_MouldProdInBill/Log/637933914350426996.log | 3
WebAPI/Sc_MouldProdInBill/Log/637933921056103923.log | 3
WebAPI/WebAPI.csproj | 3
28 files changed, 684 insertions(+), 229 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index e9ab141..a47a8de 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -176,6 +176,10 @@
{
omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -488,6 +492,10 @@
{
omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 16be230..cc45b85 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -31,6 +31,7 @@
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_MateOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -122,6 +123,7 @@
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_MoveStockBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index d249490..b70b19d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -3113,6 +3113,12 @@
grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;
}
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index e4a90dc..13b91ee 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -37,9 +37,9 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.wxm = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -245,6 +245,20 @@
this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.spRow.Click += new System.EventHandler(this.spRow_Click);
//
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
// DelRow
//
this.DelRow.AutoSize = false;
@@ -263,20 +277,7 @@
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- //
- // bc
- //
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "鐢熸垚";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.bc.Click += new System.EventHandler(this.bc_Click);
+ this.toolStripSeparator4.Visible = false;
//
// toolStripSeparator8
//
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index b076c66..00f955e 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -78,6 +78,106 @@
}
}
+ [Route("Cg_POOrderBill/list3")]
+ [HttpGet]
+ public object list3(string sWhere, string user)
+ {
+ try
+ {
+ List<string> optionList = new List<string>();
+ string sql = "select top 1 * from h_v_IF_POOrderBillList where 1 = 1 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(@"{ field: 'hmainid', title: '"+ item.ToString() + "', sort: true, hide: false }");
+ }
+ string option = string.Join(",",optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList.ToArray();
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("Cg_POOrderBill/list2")]
+ [HttpGet]
+ public object list2(string sWhere, string user)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = "select top 1 * from h_v_IF_POOrderBillList where 1 = 1 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 閲囪喘璁㈠崟 鍒嗛厤
///鍙傛暟锛歴tring sql銆�
@@ -201,13 +301,13 @@
/// </summary>
[Route("Cg_POOrderBill/Resynchronize")]
[HttpGet]
- public object Resynchronize(string HBillNo,string HBillType)
+ public object Resynchronize(string HBillNo, string HBillType)
{
try
{
oCN.BeginTran();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + HBillNo + "','"+ HBillType + "'", "h_p_WMS_ERPSourceBillToLocal");
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ERPSourceBillToLocal");
if (DS == null)
{
objJsonResult.code = "0";
@@ -325,7 +425,7 @@
else
fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
- DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = "+dr["HINTERID"].ToString());
+ DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
JObject model = new JObject();
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
@@ -561,4 +661,5 @@
//
}
+
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2e16b55..2073b09 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -189,14 +189,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HSourceID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HCenterID == 0)
{
objJsonResult.code = "0";
@@ -213,14 +213,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HWorkTimes <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HWorkTimes <= 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HEmpID2 == 0 )
//{
// objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 76b2def..c9f0218 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -465,6 +465,24 @@
}
}
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ oCN.RunProc("delete from diyipi");
+
+ //涓存椂琛ㄦ坊鍔犳暟鎹�
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ oCN.RunProc(@"insert into diyipi(浜у搧浠ｇ爜,浜у搧鍚嶇О,宸ュ簭搴忓彿,宸ュ簭浠ｇ爜,宸ュ簭,宸ヤ綔涓績,鍔犲伐鏁伴噺
+ , 鑹巼, 宸ュ簭宸ヤ环, 涓嶅悎鏍煎崟浠�, 鎶ュ簾鍗曚环, 鏈亾鍥哄畾寮�宸ュぉ鏁�, 鏈亾寮�宸ヤ綑閲�, 涓婇亾绛夊緟澶╂暟
+ , 涓婇亾寰幆鍛ㄦ湡, 鑷姩杞Щ, 澶栧崗鏍囪, 渚涘簲鍟嗕唬鐮�, 渚涘簲鍟�, 宸ヨ壓鍙傛暟, 鍥剧焊缂栧彿
+ , 鏈伐搴忕‘璁よ褰�, 澶囨敞, 鍥惧彿鐗堟湰, 鎬昏鍥惧彿, 鏉愯川, 鎴愬搧缂栧彿, 鐗堟湰
+ , 妯″叿缂栧彿, 绋嬪簭鍙�, 鐝骇瀹氶, 宸ヨ壓璺嚎鍚嶇О, 鏃堕棿鍗曚綅)values
+ ('" + tb2.Rows[i]["浜у搧浠ｇ爜"].ToString() + "','" + tb2.Rows[i]["浜у搧鍚嶇О"].ToString() + "','" + tb2.Rows[i]["宸ュ簭搴忓彿"].ToString() + "','" + tb2.Rows[i]["宸ュ簭浠ｇ爜"].ToString() + "','" + tb2.Rows[i]["宸ュ簭"].ToString() + "','" + tb2.Rows[i]["宸ヤ綔涓績"].ToString() + "','" + tb2.Rows[i]["鍔犲伐鏁伴噺"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鑹巼"].ToString() + "','" + (tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()==""?"0": tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()) + "','" + tb2.Rows[i]["涓嶅悎鏍煎崟浠�"].ToString() + "','" + tb2.Rows[i]["鎶ュ簾鍗曚环"].ToString() + "','" + tb2.Rows[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString() + "','" + tb2.Rows[i]["鏈亾寮�宸ヤ綑閲�"].ToString() + "','" + tb2.Rows[i]["涓婇亾绛夊緟澶╂暟"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["涓婇亾寰幆鍛ㄦ湡"].ToString() + "','" + tb2.Rows[i]["鑷姩杞Щ"].ToString() + "','" + tb2.Rows[i]["澶栧崗鏍囪"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟�"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓鍙傛暟"].ToString() + "','" + tb2.Rows[i]["鍥剧焊缂栧彿"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString() + "','" + tb2.Rows[i]["澶囨敞"].ToString() + "','" + tb2.Rows[i]["鍥惧彿鐗堟湰"].ToString() + "','" + tb2.Rows[i]["鎬昏鍥惧彿"].ToString() + "','" + tb2.Rows[i]["鏉愯川"].ToString() + "','" + tb2.Rows[i]["鎴愬搧缂栧彿"].ToString() + "','" + tb2.Rows[i]["鐗堟湰"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["妯″叿缂栧彿"].ToString() + "','" + tb2.Rows[i]["绋嬪簭鍙�"].ToString() + "','" + tb2.Rows[i]["鐝骇瀹氶"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓璺嚎鍚嶇О"].ToString() + "','" + tb2.Rows[i]["鏃堕棿鍗曚綅"].ToString() + "')");
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = error;
@@ -646,138 +664,19 @@
//琛ㄥご瀛楁
omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
- //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
- List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
- List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
- foreach (JObject item in jb)
+
+ ds = oCN.RunProcReturn("select distinct 浜у搧浠ｇ爜 from diyipi ", "diyipi");
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
- Dictionary<string, string> dic = new Dictionary<string, string>();
- foreach (var itm in item.Properties())
- {
- dic.Add(itm.Name, itm.Value.ToString());
- }
- list.Add(dic);
- }
-
- var hnumber = "";
- var HBillNo = "";
- long HInterID = 0;
- int[] num = new int[2] { 1, 0 };
-
- for (int i = 0; i < list.Count; i++)
- {
- //鑾峰彇鐗╂枡鏁版嵁
- ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber='" + list[i]["浜у搧浠ｇ爜"].ToString() + "' and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
- var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
- var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- var Hunitid = ds.Tables[0].Rows[0]["Hunitid"].ToString();
- var HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString();
-
- var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
- var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
- var HPicNumAssemble = list[i]["鎬昏鍥惧彿"].ToString();
- var HMaterTexture = list[i]["鏉愯川"].ToString();
- var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
- var HVerNum = list[i]["鐗堟湰"].ToString();
- var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
-
- if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
- {
- //鑾峰彇鐩稿悓涓昏〃鐨勫瓙琛ㄧ殑娣诲姞娆℃暟 HEntryID
- num[0] = 1;
- hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
-
- //娣诲姞涓昏〃鏁版嵁
- oCN.RunProc("insert into Gy_RoutingBillMain(HInterID, HBillNo, HYear, HPeriod, HBillType, HDate, HBillStatus, " +
- "HMaker, HMakeDate,HMaterNumber, HMaterID, Hunitid, HUnitNumber, HName," +
- "HPicNumVer, HPicNumAssemble, HMaterTexture, HProductNum, HVerNum, HRoutingGroupID, HStandard, HRemark,HMainPrice" +
- ",HOrgID)values" +
- $"({HInterID}, '{HBillNo}', {omdelMian.HYear}, {omdelMian.HPeriod}, '{BillType}', GETDATE(), 1" +
- $", '{user}', GETDATE(), '{HMaterNumber}', {HMaterID}, {Hunitid}, '{HUnitNumber}', '{HName}'," +
- $" '{HPicNumVer}', '{HPicNumAssemble}', '{HMaterTexture}', '{HProductNum}', '{HVerNum}', 0, 1, '',{(HMainPrice==""?"0":HMainPrice)}" +
- $",{omdelMian.HOrgID})");
- //鑾峰彇涓昏〃娣诲姞鐨勬鏁�
- num[1]++;
- }
-
- //鑾峰彇渚涘簲鍟�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where 渚涘簲鍟嗕唬鐮�='" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString()+"'", "h_v_Gy_SupplierList");
- var HSupID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ュ簭
- ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber='" + list[i]["宸ュ簭浠ｇ爜"].ToString() + "'", "Gy_Process");
- var HProcID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ヤ綔涓績
- ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["宸ヤ綔涓績"].ToString() + "'", "Gy_WorkCenter");
- var HCenterID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
- var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
- var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
- var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
- var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
- var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
- var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
- var HBeginDayQty = list[i]["鏈亾寮�宸ヤ綑閲�"].ToString();
- var HFixWorkDays = list[i]["涓婇亾绛夊緟澶╂暟"].ToString();
- var HTrunWorkDays = list[i]["涓婇亾寰幆鍛ㄦ湡"].ToString();
- var HAutoTrunFlag = list[i]["鑷姩杞Щ"].ToString();
- var HSupFlag = list[i]["澶栧崗鏍囪"].ToString();
- var HTechnologyParameter = list[i]["宸ヨ壓鍙傛暟"].ToString();
- var HPicNum = list[i]["鍥剧焊缂栧彿"].ToString();
- var HProcCheckNote = list[i]["鏈伐搴忕‘璁よ褰�"].ToString();
- var hpassrate = list[i]["鑹巼"].ToString();
- var hremark = list[i]["澶囨敞"].ToString();
- var HMouldNo = list[i]["妯″叿缂栧彿"].ToString();
- var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
- //鐗╂枡鍒嗙被
-
-
-
- oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
- ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
- ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
- ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
- $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
- $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
- $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
- $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
- //鑷娆℃暟
- num[0]++;
- if(omdelMian.HTProcessFlag == 1 )
- {
- if ((i == list.Count - 1) || (list[i]["浜у搧浠ｇ爜"].ToString() != list[i + 1]["浜у搧浠ｇ爜"].ToString()))
- {
- ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1", "Gy_Process");
- if (ds.Tables[0].Rows.Count > 0)
- HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- HProcNo = ds.Tables[0].Rows[0]["HSno"].ToString();
- oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
- ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
- ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
- ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
- $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
- $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
- $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
- $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
- }
- num[0]++;
- }
-
+ var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["浜у搧浠ｇ爜"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + num[1] + "涓伐鑹鸿矾绾�";
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + ds.Tables[0].Rows.Count + "涓伐鑹鸿矾绾�";
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
index 770bc0f..fc8ad92 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -25,11 +25,16 @@
/// <returns></returns>
[Route("JIT_Complete/JIT_CompleteDetailList")]
[HttpGet]
- public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID)
+ public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID)
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' " + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
+ string sql = "";
+ if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1")
+ {
+ sql = "and 涓荤敓浜ц鍗曞瓙鍐呯爜 = '" + HMainICMOEntryID + "' and 涓荤敓浜ц鍗曚富鍐呯爜='" + HMainICMOInterID + "' and 鏃ヨ鍒掕鍗曚富鍐呯爜='" + HICMOInterID + "'";
+ }
+ ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 1=1 " +sql + sWhere + " order by 鏃ヨ鍒掓棩鏈�,鐗╂枡ID desc ", "h_v_JIT_MOMaterReadysBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index b38c925..a01c670 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -643,7 +643,6 @@
{
try
{
- oCN.BeginTran();
Stopwatch sw = new Stopwatch();
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
@@ -653,7 +652,14 @@
DataTable resulTable = ds.Tables[0];
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
{
- return resulTable.Rows[0][0].ToString();
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = resulTable.Rows[0][0].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -664,7 +670,14 @@
string fDayPlanFEntryids = string.Empty;
if (BomList.Count == 0)
{
- return "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -1045,8 +1058,6 @@
sw.Stop();//缁撴潫璁℃椂
LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
- oCN.Commit();
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛";
@@ -1055,7 +1066,6 @@
}
catch (Exception e)
{
- oCN.RollBack();
LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index 57ec188..a123d40 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -366,5 +366,82 @@
}
}
+ #region 鐢熶骇棰嗘枡鎷嗙爜鍒楄〃
+
+ [Route("Sc_PckSplit/Get_PPickingBillList")]
+ [HttpGet]
+ public Object Get_PPickingBillList(string sWhere)
+ {
+ try
+ {
+ string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere);
+ DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList");
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇�
+ [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ [HttpGet]
+ public Object Get_PHPCruxBillList(string HBarCode)
+ {
+ try
+ {
+ string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
+ DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 781a0a4..151eb51 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -223,7 +223,8 @@
foreach (DataRow item in ds.Tables[0].Rows)
{
JObject FentityModel = new JObject();
- FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = "1" });//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FIsNew", false);// 婧愬崟绫诲瀷
+ FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = dr1["FREPORTTYPENUMBER"].ToString() });//鐢熶骇姹囨姤绫诲瀷
FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
FentityModel.Add("FProductType", "1");// 浜у搧绫诲瀷
FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
@@ -251,6 +252,9 @@
FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
+ FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
+ FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鍖呰鏍囪瘑
+ //鎵瑰彿
//FFLOWID FFLOWLINEID FRULEID FSTABLENAME
//f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
//涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index df22e67..826c8ef 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -90,22 +91,60 @@
ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖閿�鍞鍗曞姩鎬佸垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Xs_SeOrderBill/DyColList")]
+ [HttpGet]
+ public object DyColList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_IF_SeOrderBillList");
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+
}
catch (Exception e)
{
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index 72ad2b7..c816dcc 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -211,7 +211,7 @@
")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update Gy_StockCheckItem set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -290,7 +290,7 @@
}
#endregion
-
+
#region 鐩樼偣鍒嗘瀽鍒楄〃
[Route("Gy_StockCheckItemBill/Get_InventoryAnalysisList")]
@@ -304,9 +304,9 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鍒ゆ柇鏄惁閫夋嫨鐩樼偣鏂规锛屾槸=>锛堢敤鐩樼偣鏂规瀛愯〃鍋氬姣旓級锛屽惁=>锛堢敤鍣ㄥ叿妗ｆ鍋氬姣旓級
- if (sID==null|| sID == "")
+ if (sID == null || sID == "")
{
- if (sWhere=="pk")
+ if (sWhere == "pk")
{
sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
}
@@ -319,7 +319,7 @@
{
if (sWhere == "pk")
{
- sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK2 WHERE HInterID="+ sID);
+ sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisPK '{sID}'");
}
else
{
@@ -449,6 +449,10 @@
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
string userID = sArray[2].ToString();//userID
+ string sName = sArray[3].ToString();//鐩樼偣鏂规
+ //鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
ListModels oListModels = new ListModels();
@@ -461,7 +465,6 @@
{
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
- string HDate = item.HMakeDate;
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
@@ -478,9 +481,9 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3814','3814'," + HInterID + ",'" + HBillNo + "','" + HDate+"'"+
- ", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ " values('3814','3814'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "','" + HDate+
+ "', " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
@@ -498,7 +501,7 @@
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
}
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -533,6 +536,10 @@
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
string userID = sArray[2].ToString();//userID
+ string sName = sArray[3].ToString();//鐩樼偣鏂规
+ //鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
ListModels oListModels = new ListModels();
@@ -546,7 +553,6 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
- string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -562,11 +568,11 @@
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
" values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
+ ", '" + user + "','" +HDate+
+ "', " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",'',0" +
") ";
-
+
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
@@ -574,7 +580,7 @@
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ ",0,0,0," + userID + ",0,100005,'')");
-
+
//涓昏〃
oCn.BeginTran();
oCn.RunProc(sql);
@@ -582,7 +588,7 @@
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
}
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -617,6 +623,11 @@
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
string userID = sArray[2].ToString();//userID
+ string sName = sArray[3].ToString();//鐩樼偣鏂规
+ //鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
+
//杞寲鏍煎紡
ListModels oListModels = new ListModels();
@@ -629,34 +640,58 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
- string HDate = item.HMakeDate;
+ string sql, sql1;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ HInterID = DBUtility.ClsPub.CreateBillID("3828", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3828", ref DBUtility.ClsPub.sExeReturnInfo, true);
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3832", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3832", ref DBUtility.ClsPub.sExeReturnInfo, true);
-
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3832','3832'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ if (HItemID == 0)
+ {
+ sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate,HRemark" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3828','3828'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "','"+ HDate + "','" + sName + "'" +
+ ",0,0," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + ",0,0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",0,0,0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+ }
+ else
+ {
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate,HRemark" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3832','3832'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "',getdate()" + ",'" + sName + "'" +
+ ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+ }
+
//涓昏〃
oCn.BeginTran();
@@ -699,6 +734,10 @@
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
string userID = sArray[2].ToString();//userID
+ string sName = sArray[3].ToString();//鐩樼偣鏂规
+ //鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
ListModels oListModels = new ListModels();
@@ -711,7 +750,6 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
- string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -728,8 +766,8 @@
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
" values('3802','3802'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", '" + user + "','" +HDate+
+ "', " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
@@ -747,7 +785,7 @@
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
}
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -774,12 +812,17 @@
public object MakeProdBack([FromBody] JObject msg)
{
try
- { var _value = msg["msg"].ToString();
+ {
+ var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
string userID = sArray[2].ToString();//userID
+ string sName = sArray[3].ToString();//鐩樼偣鏂规
+ //鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
ListModels oListModels = new ListModels();
@@ -792,7 +835,6 @@
var HBarCode = item.HBarCode;
var HItemID = item.HItemID;
string HBillNo = "";
- string HDate = item.HMakeDate;
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
@@ -809,8 +851,8 @@
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
" values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "',getdate()" +
- ", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", '" + user + "','" +HDate+
+ "', " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
@@ -828,7 +870,7 @@
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
}
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs"
new file mode 100644
index 0000000..926e7e4
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs"
@@ -0,0 +1,103 @@
+锘縰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.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Pay_MonthlySalaryReportController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ /// <summary>
+ /// 杩斿洖閲囪喘璁㈠崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_MonthlySalaryReport/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ string sql = $"exec [h_p_MonthlySalaryReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Pay_MonthlySalaryReport/list2")]
+ [HttpGet]
+ public object list2(string sWhere)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = $"exec [h_p_MonthlySalaryReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs"
new file mode 100644
index 0000000..938a535
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs"
@@ -0,0 +1,104 @@
+锘縰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.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Pay_PieceRateWageReportController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖閲囪喘璁㈠崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_PieceRateWageReport/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ string sql = $"exec [h_p_PieceRateWageReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Pay_PieceRateWageReport/list2")]
+ [HttpGet]
+ public object list2(string sWhere)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = $"exec [h_p_PieceRateWageReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs" "b/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs"
new file mode 100644
index 0000000..6723b97
--- /dev/null
+++ "b/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class OptionListModel
+ {
+ public string field { get; set; }
+ public string title { get; set; }
+ public bool sort { get; set; }
+ public bool hide { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933914348556956.log b/WebAPI/Sc_MouldProdInBill/Log/637933914348556956.log
new file mode 100644
index 0000000..ebd60df
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933914348556956.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:30:34------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933914350426996.log b/WebAPI/Sc_MouldProdInBill/Log/637933914350426996.log
new file mode 100644
index 0000000..376e973
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933914350426996.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:30:35------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933914350477009.log b/WebAPI/Sc_MouldProdInBill/Log/637933914350477009.log
new file mode 100644
index 0000000..da220b9
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933914350477009.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:30:35------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921042282724.log b/WebAPI/Sc_MouldProdInBill/Log/637933921042282724.log
new file mode 100644
index 0000000..47a8a84
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921042282724.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:44------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921048423377.log b/WebAPI/Sc_MouldProdInBill/Log/637933921048423377.log
new file mode 100644
index 0000000..286f505
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921048423377.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:44------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921048453385.log b/WebAPI/Sc_MouldProdInBill/Log/637933921048453385.log
new file mode 100644
index 0000000..3a437d2
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921048453385.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:44------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921055483894.log b/WebAPI/Sc_MouldProdInBill/Log/637933921055483894.log
new file mode 100644
index 0000000..835fe4f
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921055483894.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:45------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921056103923.log b/WebAPI/Sc_MouldProdInBill/Log/637933921056103923.log
new file mode 100644
index 0000000..b6705f9
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921056103923.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:45------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637933921056113939.log b/WebAPI/Sc_MouldProdInBill/Log/637933921056113939.log
new file mode 100644
index 0000000..17863c7
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637933921056113939.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:41:45------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637933914368426726.log b/WebAPI/Sc_MouldProdOutBill/Log/637933914368426726.log
new file mode 100644
index 0000000..72b0141
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637933914368426726.log
@@ -0,0 +1,3 @@
+------------------------2022/7/14 10:30:36------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Vlog/webapi20220714.txt b/WebAPI/Vlog/webapi20220714.txt
new file mode 100644
index 0000000..430a5d4
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220714.txt
@@ -0,0 +1,5 @@
+2022/7/14 10:30:35 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
+
+2022/7/14 10:41:44 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
+
+2022/7/14 10:41:45 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b125d7f..e3ea52f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -428,6 +428,8 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
@@ -572,6 +574,7 @@
<Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+ <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
--
Gitblit v1.9.1