From a3f4fe73cfc233c4a912d603344a5cb650db4c93 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 九月 2021 14:01:15 +0800
Subject: [PATCH] 工序流转卡、生产任务单、工艺路线新增保存组织，列表组织过滤
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index b32a5e5..337127e 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -57,6 +57,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+ BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
@@ -112,6 +113,14 @@
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ if (BillNew.omodel.HICMOInterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
@@ -182,7 +191,7 @@
oSub.HFstProc = "鍚�";
oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
- oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].HSupFlag);
+ oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
@@ -208,6 +217,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ oSub.HMouldNo = "";
+ oSub.HProcWorkNum = "";
BillNew.DetailColl.Add(oSub);
}
}
@@ -255,9 +266,9 @@
/// </summary>
/// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
/// <returns>object</returns>
- [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
+ [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
[HttpGet]
- public object GetICMOBillDetail(int hmainid,int OrganizationID)
+ public object GetICMOBillList(int hmainid,int OrganizationID)
{
try
{
@@ -269,7 +280,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HSTOCKINORGID="+ OrganizationID, "h_v_Sc_ICMOBillListDetail");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -297,6 +308,52 @@
}
}
+ /// <summary>
+ /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
+ /// </summary>
+ /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
+ /// <returns>object</returns>
+ [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
+ [HttpGet]
+ public object GetICMOBillDetail(int hmainid, int OrganizationID)
+ {
+ try
+ {
+ if (hmainid == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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;
+ }
+ }
//
}
--
Gitblit v1.9.1