From 988180308e0dc5518d8904b34559bf291298cedf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 七月 2024 10:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs | 3
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 322 insertions(+), 1 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 06ef36a..72c6435 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"
@@ -18,6 +18,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public DLL.ClsKf_MateOutBill BillNew0 = new DLL.ClsKf_MateOutBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
public DLL.ClsKf_MateOutBill BillOld0 = new DLL.ClsKf_MateOutBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
@@ -1239,5 +1240,322 @@
}
}
#endregion
+
+ #region 鏍规嵁鍗曟嵁鍙凤紝鍚屾鐢熶骇棰嗘枡鍗�
+ [Route("Kf_MateOutBillController/GetKf_MateOutBill_Sync_Json")]
+ [HttpGet]
+ public json GetKf_MateOutBill_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_MateOut '" + HBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_MateOut");
+ 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("PRD_PickMtrl", 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='1204'", "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='1204'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from Kf_ICStockBillMain where HBillNo = '" + HBillNo + "' and HBillType='1204'", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ ////涓昏〃鏁版嵁璧嬪��
+ //var MainData = new
+ //{
+ // HInterID = HNewInterID,
+ // HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ // HBillType = "1204",
+ // HBillSubType = "1204",
+ // HMainSourceBillType = "",
+ // HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
+ // HSupID = 0,
+ // HWHID = 0,
+ // HSCWHID = 0,
+ // HEmpID = 0,
+ // HManagerID = 0,
+ // HSecManagerID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PickerId_Id"]),
+ // HKeeperID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["FSTOCKERID_Id"]),
+ // HDeptID = 0,
+ // HCurID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CurrId_Id"]),
+ // HSeOrderBillNo = "",
+ // HExplanation = "CLD瀵煎叆",
+ // HRemark = "",
+ // 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.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]),
+ // 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.isStrNull(_saveObj["Result"]["Result"]["ModifierId_Id"]),
+ // HUpDateDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ModifyDate"]),
+ // HDeleteMan = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CANCELER_Id"]),
+ // HDeleteDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CancelDate"]),
+ // HOWNERID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["OwnerId_Id"]),
+ // HOWNERTYPEID = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["OwnerTypeId"]),
+ // HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
+ // HERPBillType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillType_Id"]),
+ // HERPBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ // HPRDORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PrdOrgId_Id"]),
+ // HSTOCKORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOrgId_Id"]),
+ //};
+
+ //涓昏〃鏁版嵁璧嬪��
+ var MainData = new
+ {
+ HInterID = HNewInterID,
+ HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ HBillType = "1204",
+ HBillSubType = "1204",
+ HMainSourceBillType = "",
+ HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
+ HSupID = 0,
+ HWHID = 0,
+ HSCWHID = 0,
+ HEmpID = 0,
+ HManagerID = 0,
+ HSecManagerID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PickerId_Id"]),
+ HKeeperID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["FSTOCKERID_Id"]),
+ HDeptID = 0,
+ HCurID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CurrId_Id"]),
+ HSeOrderBillNo = "",
+ HExplanation = "CLD瀵煎叆",
+ HRemark = "",
+ 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"]),
+ HOWNERID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["OwnerId_Id"]),
+ HOWNERTYPEID = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["OwnerTypeId"]),
+ HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
+ HERPBillType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillType_Id"]),
+ HERPBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
+ HPRDORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PrdOrgId_Id"]),
+ HSTOCKORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOrgId_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
+ ,HOWNERID,HOWNERTYPEID,HERPInterID,HERPBillType,HERPBillNo
+ ,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.HOWNERID},'{MainData.HOWNERTYPEID}',{MainData.HERPInterID},'{MainData.HERPBillType}','{MainData.HERPBillNo}'
+ , {MainData.HPRDORGID},{MainData.HSTOCKORGID})";
+ oCn.RunProc(sql.Replace("\r\n", ""));
+
+ //瀛愯〃鏁版嵁璧嬪��
+ var dataArr = _saveObj["Result"]["Result"]["Entity"];
+ 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 = "",
+ HExpressNumber = "",
+ HMaterID = DBUtility.ClsPub.isLong(oSub["MaterialId_Id"]),
+ HUnitID = DBUtility.ClsPub.isLong(oSub["UnitId_Id"]),
+ HBatchNo = DBUtility.ClsPub.isStrNull(oSub["Lot_Text"]),
+ HPropertyID = DBUtility.ClsPub.isLong(oSub["AuxPropId_Id"]),
+ HWHID = DBUtility.ClsPub.isLong(oSub["StockId_Id"]),
+ HSPID = DBUtility.ClsPub.isLong(oSub["StockLocId_Id"]),
+ HSCWHID = 0,
+ HSCSPID = 0,
+ HQtyMust = DBUtility.ClsPub.isDoule(oSub["AppQty"]),
+ HQty = DBUtility.ClsPub.isDoule(oSub["ActualQty"]),
+ HPrice = DBUtility.ClsPub.isDoule(oSub["FPrice"]),
+ HMoney = DBUtility.ClsPub.isDoule(oSub["FAmount"]),
+ HTaxPrice = DBUtility.ClsPub.isDoule(oSub["FPrice"]),
+ HTaxRate = 1,
+ HTaxMoney = DBUtility.ClsPub.isDoule(oSub["FAmount"]),
+ HRelationQty = DBUtility.ClsPub.isDoule(oSub["SelPrcdReturnQty"]),
+ HRelationMoney = 0,
+ HSourceInterID = DBUtility.ClsPub.isLong(oSub["SrcInterId"]),
+ HSourceEntryID = DBUtility.ClsPub.isLong(oSub["SrcEnteryId"]),
+ HSourceBillNo = DBUtility.ClsPub.isStrNull(oSub["SrcBillNo"]),
+ HSourceBillType = DBUtility.ClsPub.isStrNull(oSub["SrcBillType"]),
+ 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 = DBUtility.ClsPub.isLong(oSub["MoId"]),
+ HICMOEntryID = DBUtility.ClsPub.isLong(oSub["MoEntryId"]),
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(oSub["MoBillNo"]),
+ 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/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
index 2d04bce..3453dcc 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -206,6 +206,8 @@
arr[i, j] = cols[j]; //瀛樺叆浜岀淮鏁扮粍
}
}
+
+ oCn.BeginTran();
//娓呯┖鍗曚綅鎹㈢畻琛ㄦ暟鎹�
oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -267,6 +269,7 @@
oCn.RunProc(sql.Replace("\r\n", ""));
oCn.RunProc("set identity_insert Gy_UnitConvertRate off", ref DBUtility.ClsPub.sExeReturnInfo);
}
+ oCn.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 12bad12..2b9ac2c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile15.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1