From 755b10dac0b5518ec4656996a069b97793ac0623 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 09 八月 2024 17:09:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/Kf_MoveStockBillController.cs | 315 +++++++++++++++++++++++++++++++++++++++
WebAPI/Web.config | 6
WebAPI/Controllers/SBGL/Sb_EquipReportController.cs | 42 +++++
WebAPI/Controllers/ProductInController.cs | 69 ++++++--
WebAPI/WebAPI.csproj | 1
5 files changed, 411 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index a9a1b45..23d2708 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -304,8 +304,11 @@
//oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
- string sExpressNumber = "";
- //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+
+ Kf_MoveStockBillController obill = new Kf_MoveStockBillController();
+ //閲嶆柊鍚屾鐩存帴璋冩嫧鍗�
+ objJsonResult = obill.GetKf_MoveStockBill_Sync_Json(HBillNo, HBillType);
+
WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
@@ -362,28 +365,56 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
- string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
- string sExpressNumber = "";
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
- bool flag = WebSoBar == null;
- object result;
- if (flag)
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- this.objJsonResult.code = "0";
- this.objJsonResult.count = 0;
- this.objJsonResult.Message = ClsPub.sErrInfo;
- this.objJsonResult.data = null;
- result = this.objJsonResult;
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+ }
+ else
+ {
+ sJXCode = sCode;
+ }
+ try
+ {
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
- this.objJsonResult.code = "0";
- this.objJsonResult.count = 1;
- this.objJsonResult.Message = ClsPub.sErrInfo;
- this.objJsonResult.data = WebSoBar;
- result = this.objJsonResult;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
}
- return result;
}
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
index 28d4597..4d9699b 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
@@ -233,5 +233,47 @@
}
#endregion
+
+ #region 璁惧缁翠慨璁板綍鎶ヨ〃
+
+ /// <summary>
+ /// 璁惧缁翠慨璁板綍鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipReportController/GetSb_EquipRepairReport_Json")]
+ [HttpGet]
+ public object GetSb_EquipRepairReport_Json(DateTime HBeginDate, DateTime HEndDate, Int64 HStockOrgID, string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairReport '" + HBeginDate.ToShortDateString() + "','" + HEndDate.ToShortDateString() + "'," + HStockOrgID.ToString() + "," + sWhere, "h_p_Sb_EquipRepairReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
}
}
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MoveStockBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MoveStockBillController.cs"
new file mode 100644
index 0000000..acb84f3
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MoveStockBillController.cs"
@@ -0,0 +1,315 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Data;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Kf_MoveStockBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "1207"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鐩存帴璋冩嫧鍗�"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Kf_MoveStockBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public const string ModRightNameMoney = ModRightName + "_Money"; //閲戦
+ public const string ModRightNameQty = ModRightName + "_Qty"; //鏁伴噺
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DAL.ClsKf_MoveStockBill oBill = new DAL.ClsKf_MoveStockBill();
+
+
+ #region 鏍规嵁鍗曟嵁鍙凤紝鍚屾鐩存帴璋冩嫧鍗�
+ [Route("Kf_MoveStockBillController/GetKf_MoveStockBill_Sync_Json")]
+ [HttpGet]
+ public json GetKf_MoveStockBill_Sync_Json(string HBillNo, string HBillType)
+ {
+ try
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sql = string.Empty;
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ //绉佹湁浜戞ā寮忥紝閫氳繃璋冪敤瀛樺偍杩囩▼杩涜鍚屾
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "Y")
+ {
+ ds = oCn.RunProcReturn("exec h_p_IFCLD_ERPSourceBillToLocal_MoveStock '" + HBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_MoveStock");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍚屾鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ //鍏湁浜戞ā寮忥紝閫氳繃璋冪敤WEBAPI鏂瑰紡杩涜鍚屾
+ else if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N")
+ {
+ //鍒ゆ柇閲戣澏浜戞槸鍚︾櫥褰曟垚鍔�
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触锛岄噾铦朵簯鐧诲叆涓嶆垚鍔燂紝璇风‘璁鐩橀厤缃枃浠舵墍璁剧疆閲戣澏浜戝搴旂綉鍧�銆佽处濂椼�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮佹槸鍚︽纭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var json = new
+ {
+ CreateOrgId = 0,
+ Number = HBillNo,
+ Id = ""
+ };
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.View("STK_TransferDirect", JsonConvert.SerializeObject(json));
+ var _saveObj = JObject.Parse(_result);
+ //鍒ゆ柇閲戣澏浜戞暟鎹槸鍚﹁幏鍙栨垚鍔�
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏浜戠洿鎺ヨ皟鎷ㄥ崟鑾峰彇澶辫触锛�" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+ //鏌ユ壘鏈湴鐩存帴璋冩嫧鍗曡〃涓槸鍚﹀瓨鍦ㄨ鍗曟嵁锛屽瓨鍦ㄨ幏鍙栨湰鍗曞崟鎹甀D锛屼笉瀛樺湪鍒欒幏鍙栨渶澶у崟鎹甀D
+ Int64 HNewInterID = 0;
+ ds = oCn.RunProcReturn("select HInterID from Kf_ICStockBillMain with(nolock) where HBillNo = '" + HBillNo + "' and HBillType='1207'", "Kf_ICStockBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ HNewInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
+ }
+ else
+ {
+ HNewInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+ }
+
+ //鏍规嵁鍗曟嵁鍙峰垹闄ゆ湰鍦扮洿鎺ヨ皟鎷ㄥ崟涓搴斿崟鎹�
+ oCn.RunProc("Delete b from Kf_ICStockBillMain a inner join Kf_ICStockBillSub b on a.HInterID=b.HInterID where a.HBillNo = '" + HBillNo + "' and a.HBillType='1207'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from Kf_ICStockBillMain where HBillNo = '" + HBillNo + "' and HBillType='1207'", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //涓昏〃鏁版嵁璧嬪��
+ var MainData = new
+ {
+ HInterID = HNewInterID,
+ HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ HBillType = "1207",
+ HBillSubType = "1207",
+ HMainSourceBillType = "",
+ HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
+ HSupID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["SupplierID_Id"]),
+ HWHID = 0,
+ HSCWHID = 0,
+ HEmpID = 0,
+ HManagerID = 0,
+ HSecManagerID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["SalerId_Id"]),
+ HKeeperID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockerId_Id"]),
+ HDeptID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["SaleDeptId_Id"]),
+ HCurID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CustID_Id"]),
+ HSeOrderBillNo = "",
+ HExplanation = "CLD瀵煎叆",
+ HRemark = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["Note"]),
+ HInnerBillNo = "",
+ HRedBlueFlag = 0,
+ HBillStatus = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? 1 : 2,
+ HMaker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CreatorId"]["Name"]),
+ HMakeDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CreateDate"]),
+ HChecker = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]["Name"]),
+ HCheckDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ApproveDate"]),
+ HUpDater = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ModifierId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ModifierId"]["Name"]),
+ HUpDateDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ModifyDate"]),
+ HDeleteMan = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CANCELER_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CANCELER"]["Name"]),
+ HDeleteDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CancelDate"]),
+ HStockStyle = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["TransferBizType"]) == "InnerOrgTransfer" ? "缁勭粐鍐呰皟鎷�" : "璺ㄧ粍缁囪皟鎷�",
+ HOWNERID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["OwnerIdHead_Id"]),
+ HOWNERTYPEID = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["OwnerTypeIdHead"]),
+ HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
+ HERPBillType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillTypeID_Id"]),
+ HERPBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ HSTOCKINORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOrgId_Id"]),
+ HSTOCKOUTORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOutOrgId_Id"]),
+ HSALEORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["SaleOrgId_Id"]),
+ HSETTLEORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["SettleOrgId_Id"]),
+ HPRDORGID = 0,
+ HSTOCKORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOutOrgId_Id"]),
+ };
+ //鍐欏叆涓昏〃
+ sql = $@"Insert into Kf_ICStockBillMain
+ (HInterID,HYear,HPeriod,HBillNo,HBillType,HBillSubType,HMainSourceBillType,HDate
+ ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HCurID
+ ,HSeOrderBillNo,HExplanation,HRemark,HInnerBillNo,HRedBlueFlag,HBillStatus
+ ,HMaker,HMakeDate
+ ,HChecker,HCheckDate
+ ,HUpDater,HUpDateDate
+ ,HDeleteMan,HDeleteDate
+ ,HStockStyle
+ ,HOWNERID,HOWNERTYPEID,HERPInterID,HERPBillType,HERPBillNo
+ ,HSTOCKINORGID,HSTOCKOUTORGID,HSALEORGID,HSETTLEORGID
+ ,HPRDORGID,HSTOCKORGID)
+ Values({MainData.HInterID},year('{MainData.HDate}'),month('{MainData.HDate}'),'{MainData.HBillNo}','{MainData.HBillType}','{MainData.HBillSubType}','{MainData.HMainSourceBillType}','{MainData.HDate}'
+ , {MainData.HSupID},{MainData.HWHID},{MainData.HSCWHID},{MainData.HEmpID},{MainData.HManagerID},{MainData.HSecManagerID},{MainData.HKeeperID},{MainData.HDeptID},{MainData.HCurID}
+ ,'{MainData.HSeOrderBillNo}','{MainData.HExplanation}','{MainData.HRemark}','{MainData.HInnerBillNo}',{MainData.HRedBlueFlag},{MainData.HBillStatus}
+ ,'{MainData.HMaker}','{MainData.HMakeDate}'
+ ,'{MainData.HChecker}',case when '{MainData.HCheckDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HCheckDate}' end
+ ,'{MainData.HUpDater}',case when '{MainData.HUpDateDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HUpDateDate}' end
+ ,'{MainData.HDeleteMan}',case when '{MainData.HDeleteDate}' = '1900/1/1 0:00:00' then NULL else '{MainData.HDeleteDate}' end
+ ,'{MainData.HStockStyle}'
+ , {MainData.HOWNERID},'{MainData.HOWNERTYPEID}',{MainData.HERPInterID},'{MainData.HERPBillType}','{MainData.HERPBillNo}'
+ , {MainData.HSTOCKINORGID},{MainData.HSTOCKOUTORGID},{MainData.HSALEORGID},{MainData.HSETTLEORGID}
+ , {MainData.HPRDORGID},{MainData.HSTOCKORGID})";
+ oCn.RunProc(sql.Replace("\r\n", ""));
+
+ //瀛愯〃鏁版嵁璧嬪��
+ var dataArr = _saveObj["Result"]["Result"]["TransferDirectEntry"];
+ foreach (var oSub in dataArr)
+ {
+ var subData = new
+ {
+ HInterID = HNewInterID,
+ HEntryID = DBUtility.ClsPub.isLong(oSub["Id"]),
+ HMTONo = DBUtility.ClsPub.isStrNull(oSub["MtoNo"]),
+ HPlanMode = 0,
+ HRemark = DBUtility.ClsPub.isStrNull(oSub["NoteEntry"]),
+ HExpressNumber = "",
+ HMaterID = DBUtility.ClsPub.isLong(oSub["MaterialId_Id"]),
+ HUnitID = DBUtility.ClsPub.isLong(oSub["UnitId_Id"]),
+ HBatchNo = DBUtility.ClsPub.isStrNull(oSub["DestLot_Text"]),
+ HPropertyID = DBUtility.ClsPub.isLong(oSub["AuxPropId_Id"]),
+ HWHID = DBUtility.ClsPub.isLong(oSub["DestStockId_Id"]),
+ HSPID = DBUtility.ClsPub.isLong(oSub["DestStockLocId_Id"]),
+ HSCWHID = DBUtility.ClsPub.isLong(oSub["SrcStockId_Id"]),
+ HSCSPID = DBUtility.ClsPub.isLong(oSub["SrcStockLocId_Id"]),
+ HQtyMust = DBUtility.ClsPub.isDoule(oSub["Qty"]),
+ HQty = DBUtility.ClsPub.isDoule(oSub["Qty"]),
+ HPrice = DBUtility.ClsPub.isDoule(oSub["Price"]),
+ HMoney = DBUtility.ClsPub.isDoule(oSub["Amount"]),
+ HTaxPrice = DBUtility.ClsPub.isDoule(oSub["Price"]),
+ HTaxRate = 1,
+ HTaxMoney = DBUtility.ClsPub.isDoule(oSub["Amount"]),
+ HRelationQty = 0,
+ HRelationMoney = 0,
+ HSourceInterID = 0,
+ HSourceEntryID = 0,
+ HSourceBillNo = DBUtility.ClsPub.isStrNull(oSub["SrcBillNo"]),
+ HSourceBillType = DBUtility.ClsPub.isStrNull(oSub["SrcBillTypeId"]),
+ HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
+ HERPEntryID = DBUtility.ClsPub.isLong(oSub["Id"]),
+ HERPBillNo_Sub = "",
+ HPOOrderInterID = 0,
+ HPOOrderEntryID = 0,
+ HPOOrderBillNo = "",
+ HSeOrderInterID = 0,
+ HSeOrderEntryID = 0,
+ HSeOrderBillNo = "",
+ HICMOInterID = 0,
+ HICMOEntryID = 0,
+ HICMOBillNo = "",
+ HWWOrderInterID = 0,
+ HWWOrderEntryID = 0,
+ HWWOrderBillNo = "",
+ HProduceDate = DBUtility.ClsPub.isDate(oSub["ProduceDate"]),
+ HExpiryDate = DBUtility.ClsPub.isDate(oSub["ExpiryDate"]),
+ HOWNERID = DBUtility.ClsPub.isLong(oSub["OwnerId_Id"]),
+ HOWNERTYPEID = DBUtility.ClsPub.isStrNull(oSub["OwnerTypeId"]),
+ HKEEPERID = DBUtility.ClsPub.isLong(oSub["KeeperId_Id"]),
+ HKEEPERTYPEID = DBUtility.ClsPub.isStrNull(oSub["KeeperTypeId"]),
+ };
+
+ //鍐欏叆瀛愯〃
+ sql = $@"Insert into Kf_ICStockBillSub
+ (HInterID,HEntryID,HMTONo,HPlanMode,HRemark,HExpressNumber
+ ,HMaterID,HUnitID,HBatchNo,HPropertyID,HWHID,HSPID,HSCWHID,HSCSPID
+ ,HQtyMust,HQty,HPrice,HMoney,HTaxPrice,HTaxRate,HTaxMoney,HRelationQty,HRelationMoney
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HERPInterID,HERPEntryID,HERPBillNo_Sub
+ ,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
+ ,HICMOInterID,HICMOEntryID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo
+ ,HProduceDate
+ ,HExpiryDate
+ ,HOWNERID,HOWNERTYPEID,HKEEPERID,HKEEPERTYPEID)
+ Values ({subData.HInterID},{subData.HEntryID},'{subData.HMTONo}',{subData.HPlanMode},'{subData.HRemark}','{subData.HExpressNumber}'
+ ,{subData.HMaterID},{subData.HUnitID},'{subData.HBatchNo}',{subData.HPropertyID},{subData.HWHID},{subData.HSPID},{subData.HSCWHID},{subData.HSCSPID}
+ ,{subData.HQtyMust},{subData.HQty},{subData.HPrice},{subData.HMoney},{subData.HTaxPrice},{subData.HTaxRate},{subData.HTaxMoney},{subData.HRelationQty},{subData.HRelationMoney}
+ ,{subData.HSourceInterID},{subData.HSourceEntryID},'{subData.HSourceBillNo}','{subData.HSourceBillType}',{subData.HERPInterID},{subData.HERPEntryID},'{subData.HERPBillNo_Sub}'
+ ,{subData.HPOOrderInterID},{subData.HPOOrderEntryID},'{subData.HPOOrderBillNo}',{subData.HSeOrderInterID},{subData.HSeOrderEntryID},'{subData.HSeOrderBillNo}'
+ ,{subData.HICMOInterID},{subData.HICMOEntryID},'{subData.HICMOBillNo}',{subData.HWWOrderInterID},{subData.HWWOrderEntryID},'{subData.HWWOrderBillNo}'
+ ,case when '{subData.HProduceDate}' = '1900/1/1 0:00:00' then NULL else '{subData.HProduceDate}' end
+ ,case when '{subData.HExpiryDate}' = '1900/1/1 0:00:00' then NULL else '{subData.HExpiryDate}' end
+ ,{subData.HOWNERID},'{subData.HOWNERTYPEID}',{subData.HKEEPERID},'{subData.HKEEPERTYPEID}')";
+ oCn.RunProc(sql.Replace("\r\n", ""));
+ }
+
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓嶆敮鎸佸悓姝ュ姛鑳斤紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍚屾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 62e9402..07825de 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -106,7 +106,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -115,7 +115,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>
+ <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 23e2b59..4067b6e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -408,6 +408,7 @@
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
<Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
<Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />
--
Gitblit v1.9.1