From 0549885dcaed25c47e4fee61d0fc980867810238 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 07 六月 2024 11:29:11 +0800
Subject: [PATCH] 添加委外加工入库出库单接口
---
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git "a/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" "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"
index 740127d..57452bb 100644
--- "a/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"
+++ "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"
@@ -38,7 +38,7 @@
return objJsonResult;
}
- ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList_Search " + sWhere + " order by hmainid desc", "h_v_IF_MateOutBillList_Search");
+ ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList_Search " + sWhere + " order by 鏃ユ湡 desc, hmainid desc", "h_v_IF_MateOutBillList_Search");
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
@@ -126,6 +126,17 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
@@ -403,7 +414,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark,瀹為檯绉伴噸 HWeight
from h_v_IF_MateOutBillList"), "H_V_IF_MATEOUTBILLLIST");
}
@@ -411,9 +422,9 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate, HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ string sql1 = string.Format(@"select HMaterID ,鐗╂枡浠ｇ爜 HMaterCode ,鐗╂枡鍚嶇О HMaterName,鐗╂枡鍏紡 HMaterRuleType,瑙勬牸鍨嬪彿 HMaterSpec,鐢ㄩ噺 HRate, HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName,搴旀敹鏁伴噺 HQtyMust,瀹炴敹鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,HWHID,棰嗘枡浠撳簱浠ｇ爜 HWHCode,棰嗘枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark, 瀹為檯绉伴噸 HWeight
from h_v_IF_MateOutBillList WHERE 1=1");
- string sql = sql1 + sqlWhere;
+ string sql = sql1 + sqlWhere + " order by HSubID asc";
ds = oCN.RunProcReturn(sql, "H_V_IF_MATEOUTBILLLIST");
}
//鏌ユ眹鎬�
@@ -597,6 +608,16 @@
oBill.DetailColl.Add(oItemSub);
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -864,10 +885,20 @@
return objJsonResult;
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
- {
+ {
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
@@ -887,7 +918,7 @@
}
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
- {
+ {
//鍙嶅鏍告彁浜bandonCheck
if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
--
Gitblit v1.9.1