From 0687eded01f40be3ed584ab9d514cb9362787b71 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 12 三月 2024 16:32:26 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
index 70d50bf..ee5d53c 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceController.cs"
@@ -37,7 +37,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc", "h_v_Gy_ProcPriceList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -120,7 +120,7 @@
oSub.HMaterID = DBUtility.ClsPub.isLong(subList[i].HMaterIDCol);
oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcIDCol);
oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceIDCol);
- oSub.HPrice = DBUtility.ClsPub.isLong(subList[i].HPriceCol);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[i].HPriceCol);
oSub.HBeginDate = DBUtility.ClsPub.isDate(subList[i].HBeginDateCol);
oSub.HEndDate = DBUtility.ClsPub.isDate(subList[i].HEndDateCol);
oSub.HCostFlag = DBUtility.ClsPub.GridToBool(subList[i].HCostFlagCol);
@@ -131,6 +131,17 @@
oSub.HMaker = DBUtility.ClsPub.isStrNull(mainList[0].HMaker);
oSub.HMakeDate = DateTime.Today.ToString();
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemarkCol);
+ oSub.HWorkCenterID = DBUtility.ClsPub.isLong(subList[i].HWorkCenterID);
+ oSub.HWorkQty = DBUtility.ClsPub.isSingle(subList[i].HWorkQty); //灏忔椂浜ц兘
+ oSub.HStdEmp = DBUtility.ClsPub.isSingle(subList[i].HStdEmp); //鏍囧噯浜哄姏
+ oSub.HChangeTimes = DBUtility.ClsPub.isSingle(subList[i].HChangeTimes); //鎹㈢嚎鏃堕棿
+ oSub.HChangeMoney = DBUtility.ClsPub.isSingle(subList[i].HChangeMoney); //鎹㈢嚎琛ヨ创
+ oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo); //宸ヨ壓璺嚎娴佹按鍙�
+ oSub.HPieceTimes = DBUtility.ClsPub.isSingle(subList[i].HPieceTimes); //鍗曚欢鍔犲伐鏃堕棿锛堝瓧娈靛彲鑳藉凡缁忓瓨鍦ㄤ簡锛�
+ oSub.HMouldQty = DBUtility.ClsPub.isSingle(subList[i].HMouldQty); //妯″叿鏁伴噺
+ oSub.HChangeMouldMoney = DBUtility.ClsPub.isSingle(subList[i].HChangeMouldMoney); //鎹㈡ā琛ヨ创
+ oSub.HRushQty = DBUtility.ClsPub.isSingle(subList[i].HRushQty); //鍗曚欢鍐叉娆℃暟
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -415,5 +426,42 @@
}
#endregion
+
+ #region 缁存姢宸ヤ环鏃惰繑鍥炲伐鑹鸿矾绾夸俊鎭�
+ [Route("Gy_RoutingBill/EditPrice")]
+ [HttpGet]
+ public object EditPrice(string HMaterNumber)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec Gy_RoutingBill_EditPrice '" + HMaterNumber + "'", "Gy_RoutingBill_EditPrice");
+
+ //娣诲姞鍒楀悕
+ 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.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1