From 566af70c34690318ff24fba021b22dd866494e63 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 15 五月 2023 12:23:20 +0800
Subject: [PATCH] 生产订单、工序流转卡增加系统参数：删除人必须是制单人
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 105 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 41 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index e0223b8..56f29a2 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -410,6 +410,14 @@
string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
+ if(ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鐢熶骇姹囨姤鍗曡繃绋嬩腑娌℃湁鏌ヨ鍒板嚭绔欏崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DataRow dr = ds.Tables[0].Rows[0];
//淇濆瓨
@@ -685,6 +693,21 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //鍒ゆ柇閲戣澏浜戠敓浜ф眹鎶ュ崟 鏁伴噺 鏄惁 澶т簬 鏈亾鍑虹珯鏁伴噺
+ ds= oCN.RunProcReturn($@"select sum(FFinishQty)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}')
+from AIS20220308151944..T_PRD_MORPT rpt3
+left join AIS20220308151944..T_PRD_MORPTENTRY rpt2 on rpt3.FID = rpt2.FID
+where F_bsv_Text=(select HProcExchBillNo from Sc_StationOutBillMain where HBillNo='{BillNo}')", "SumCount");
+
+ if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏浜戞眹鎶ユ暟閲忓皬浜庢湰鍦板嚭绔欐暟閲�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
JObject model = new JObject();
model.Add("FBillType", new JObject() { ["FNumber"] = "SCRKD01_SYS" }); //鍗曟嵁绫诲瀷
@@ -1392,49 +1415,49 @@
- /// <summary>
- /// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟
- /// </summary>
- /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
- /// <returns></returns>
- [Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")]
- [HttpGet]
- public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
- double HCheckQty, double HRightQty, double HBadQty,
- string HCheckResult, string HSupNumber,
- string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
- Int64 HSourceEntryID, string HSourceBillNo, string user,
- Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
- Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
- Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID,ref string sErrMsg)
- {
- WebS2.WebService1 oWebs1 = new WebS2.WebService1();
+ ///// <summary>
+ ///// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟
+ ///// </summary>
+ ///// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ ///// <returns></returns>
+ //[Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")]
+ //[HttpGet]
+ //public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
+ // double HCheckQty, double HRightQty, double HBadQty,
+ // string HCheckResult, string HSupNumber,
+ // string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
+ // Int64 HSourceEntryID, string HSourceBillNo, string user,
+ // Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
+ // Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
+ // Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID,ref string sErrMsg)
+ //{
+ // WebS.WebService1 oWebs1 = new WebS.WebService1();
- //oWebs1.Url = "http://localhost:9099/WebService1.asmx";
- //K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
- if (oWebs1.set_SaveQcStockInCheckBill_New(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty
- , HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID
- , HSourceEntryID, HSourceBillNo, user, HWHID, HSPID
- , HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID
- , HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID
- , ref sErrMsg))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�";
- objJsonResult.data = sErrMsg;
- return objJsonResult;
- }
- }
+ // //oWebs1.Url = "http://localhost:9099/WebService1.asmx";
+ // //K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
+ // if (oWebs1.set_SaveQcStockInCheckBill_New(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty
+ // , HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID
+ // , HSourceEntryID, HSourceBillNo, user, HWHID, HSPID
+ // , HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID
+ // , HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID
+ // , ref sErrMsg))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鐢熸垚鍗曟嵁鎴愬姛锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�";
+ // objJsonResult.data = sErrMsg;
+ // return objJsonResult;
+ // }
+ //}
#endregion
--
Gitblit v1.9.1