From 9debd57fc94b380ec7f24722c7506119b0779937 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 24 十月 2025 09:49:59 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 162 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 51 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 2770909..b440953 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -3350,7 +3350,7 @@
#region [鍚屾鍩虹璧勬枡]
[Route("Gy_Material/Gy_MaterialViewApi")]
[HttpGet]
- public json Gy_MaterialViewApi(string Number, string Type)
+ public json Gy_MaterialViewApi(string Number, string Type, string HUseOrgID)
{
string sql = string.Empty;
string sReturn = "";
@@ -3408,14 +3408,24 @@
{
#region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
var json = new
+ // {
+ // CreateOrgId = 0,
+ // Number = Number,
+ // Id = ""
+ // };
{
- CreateOrgId = 0,
- Number = Number,
- Id = ""
+ FormId= "BD_MATERIAL",
+ FieldKeys= "FMASTERID,FNUMBER,FNAME,FSPECIFICATION,FFORBIDSTATUS,FErpClsID,FBaseUnitId,FLENGTH,FWIDTH,FHEIGHT,FNETWEIGHT,FGROSSWEIGHT,FOldNumber,FSTOCKPLACEID,FPLANMODE,FCREATEDATE,FCREATEORGID,FUSEORGID,FISBATCHMANAGE,FCheckIncoming,FIsEnable1,FIsKFPeriod,FAuxUnitID,FSNUNIT,FBaseUnitId,FSaleUnitId,FSalePriceUnitId,FPerUnitStandHour,FStdLaborPrePareTime,FStdMachinePrepareTime",
+ FilterString= $@"FNUMBER='{Number}' AND FUSEORGID={HUseOrgID}",
+ OrderString= "",
+ TopRowCount= 0,
+ StartRow= 0,
+ Limit= 0
};
- #region [閲戣澏閮ㄥ垎]
- //鐧诲綍閲戣澏
- var loginRet = InvokeHelper.Login();
+
+ #region [閲戣澏閮ㄥ垎]
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
//鍒ゆ柇鏄惁鐧诲綍鎴愬姛
if (isSuccess < 0)
@@ -3427,14 +3437,22 @@
return objJsonResult;
}
//鏌ョ湅 鑾峰彇鏁版嵁
- var _result = InvokeHelper.View("BD_MATERIAL", JsonConvert.SerializeObject(json));
- var _saveObj = JObject.Parse(_result);
+ var _result = InvokeHelper.Query("BD_MATERIAL", JsonConvert.SerializeObject(json));
+ var _saveObj = JArray.Parse(_result);
//鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
- if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "閲戣澏鐗╂枡鍚屾澶辫触jsonRoot锛�" + _result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ if (_saveObj.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閲戣澏鐗╂枡鍚屾澶辫触jsonRoot锛�" + _result;
+ objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑鐗╂枡浠ｇ爜鏃犲搴旂殑鐗╂枡";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3450,47 +3468,89 @@
#region [琛ㄦ暟鎹祴鍊糫
var jsonData = new
+ // {
+ // HItemID = _saveObj["Result"]["Result"]["Id"],
+ // HERPItemID = _saveObj["Result"]["Result"]["Id"],
+ // HNumber = _saveObj["Result"]["Result"]["Number"],
+ // HName = _saveObj["Result"]["Result"]["Name"][1]["Value"],
+ // HModel = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
+ // HShortNumber = _saveObj["Result"]["Result"]["Number"],
+ // HParentID = 0,
+ // HLevel = 1,
+ // HEndFlag = 1,
+ // HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
+ // HRemark = "CLD-ERP瀵煎叆",
+ // HMaterClsID = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
+ // HUnitID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
+ // HUnitGroupID = 0,
+ // HLength = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
+ // HWidth = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
+ // HHeight = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
+ // HJQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
+ // HMQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
+ // HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
+ // HWHID = 0,
+ // HSPID = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
+ // HPlanMode = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
+ // HUseFlag = "鏈楠�",
+ // HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
+ // HMinPickQty = 0,
+ // HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
+ // HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+ // HBatchManager = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
+ // HCHECKINCOMING = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
+ // HAuxPropFlag = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
+ // HISKFPERIOD = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
+ // HAuxUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
+ // HSNUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
+ // HBASEUNITID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
+ // HSALEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
+ // HSALEPRICEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
+ // HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
+ // HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
+ // HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]
+ // };
{
- HItemID = _saveObj["Result"]["Result"]["Id"],
- HERPItemID = _saveObj["Result"]["Result"]["Id"],
- HNumber = _saveObj["Result"]["Result"]["Number"],
- HName = _saveObj["Result"]["Result"]["Name"][1]["Value"],
- HModel = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
- HShortNumber = _saveObj["Result"]["Result"]["Number"],
- HParentID = 0,
- HLevel = 1,
- HEndFlag = 1,
- HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
- HRemark = "CLD-ERP瀵煎叆",
- HMaterClsID = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
- HUnitID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
- HUnitGroupID = 0,
- HLength = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
- HWidth = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
- HHeight = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
- HJQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
- HMQty = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
- HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
- HWHID = 0,
- HSPID = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
- HPlanMode = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
- HUseFlag = "鏈楠�",
- HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
- HMinPickQty = 0,
- HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
- HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
- HBatchManager = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
- HCHECKINCOMING = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
- HAuxPropFlag = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
- HISKFPERIOD = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
- HAuxUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
- HSNUnitID = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
- HBASEUNITID = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
- HSALEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
- HSALEPRICEUNITID = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
- HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
- HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
- HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]
+ HItemID = _saveObj[0][0], // 瀵瑰簲FMASTERID
+ HERPItemID = _saveObj[0][0], // 瀵瑰簲FMASTERID
+ HNumber = _saveObj[0][1], // 瀵瑰簲FNUMBER
+ HName = _saveObj[0][2], // 瀵瑰簲FNAME
+ HModel = _saveObj[0][3], // 瀵瑰簲FSPECIFICATION
+ HShortNumber = _saveObj[0][1], // 瀵瑰簲FNUMBER
+ HParentID = 0,
+ HLevel = 1,
+ HEndFlag = 1,
+ HStopflag = _saveObj[0][4].ToString() == "A" ? 0 : 1, // 瀵瑰簲FFORBIDSTATUS
+ HRemark = "CLD-ERP瀵煎叆",
+ HMaterClsID = _saveObj[0][5], // 瀵瑰簲FErpClsID
+ HUnitID = _saveObj[0][6], // 瀵瑰簲FBaseUnitId
+ HUnitGroupID = 0,
+ HLength = _saveObj[0][7], // 瀵瑰簲FLENGTH
+ HWidth = _saveObj[0][8], // 瀵瑰簲FWIDTH
+ HHeight = _saveObj[0][9], // 瀵瑰簲FHEIGHT
+ HJQty = _saveObj[0][10], // 瀵瑰簲FNETWEIGHT
+ HMQty = _saveObj[0][11], // 瀵瑰簲FGROSSWEIGHT
+ HOldMaterNumber = _saveObj[0][12], // 瀵瑰簲FOldNumber
+ HWHID = 0,
+ HSPID = _saveObj[0][13], // 瀵瑰簲FSTOCKPLACEID
+ HPlanMode = _saveObj[0][14], // 瀵瑰簲FPLANMODE
+ HUseFlag = "鏈楠�",
+ HMakeTime = _saveObj[0][15], // 瀵瑰簲FCREATEDATE
+ HMinPickQty = 0,
+ HCREATEORGID = _saveObj[0][16], // 瀵瑰簲FCREATEORGID
+ HUSEORGID = _saveObj[0][17], // 瀵瑰簲FUSEORGID
+ HBatchManager = (bool)_saveObj[0][18] ? 1 : 0, // 瀵瑰簲FISBATCHMANAGE
+ HCHECKINCOMING = (bool)_saveObj[0][19] ? 1 : 0, // 瀵瑰簲FCheckIncoming
+ HAuxPropFlag = (bool)_saveObj[0][20] ? 1 : 0, // 瀵瑰簲FIsEnable1
+ HISKFPERIOD = (bool)_saveObj[0][21] ? 1 : 0, // 瀵瑰簲FIsKFPeriod
+ HAuxUnitID = _saveObj[0][22], // 瀵瑰簲FAuxUnitID
+ HSNUnitID = _saveObj[0][23], // 瀵瑰簲FSNUNIT
+ HBASEUNITID = _saveObj[0][24], // 瀵瑰簲FBaseUnitId
+ HSALEUNITID = _saveObj[0][25], // 瀵瑰簲FSaleUnitId
+ HSALEPRICEUNITID = _saveObj[0][26], // 瀵瑰簲FSalePriceUnitId
+ HPERUNITSTANDHOUR = _saveObj[0][27], // 瀵瑰簲FPerUnitStandHour
+ HSTDLABORPREPARETIME = _saveObj[0][28], // 瀵瑰簲FStdLaborPrePareTime
+ HSTDMACHINEPREPARETIME = _saveObj[0][29] // 瀵瑰簲FStdMachinePrepareTime
};
#endregion
// 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
--
Gitblit v1.9.1