From bcf43dd62760da49533a654ee76609238f9933f9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 26 十一月 2021 16:17:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
similarity index 98%
rename from "WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs"
rename to "WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 097ea57..23443e6 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -28,7 +28,7 @@
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList");
+ ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList " + sWhere + " order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -54,7 +54,7 @@
/// <returns></returns>
[Route("Kf_MateOutBill/set_DeleteBill")]
[HttpGet]
- public object set_DeleteBill(string HInterID,string user)
+ public object set_DeleteBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, true, user))
@@ -88,7 +88,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker !=null)
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -383,7 +383,7 @@
{
ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
from h_v_IF_MateOutBillList"), "H_V_IF_MATEOUTBILLLIST");
-
+
}
else
{
--
Gitblit v1.9.1