From 9faee57fcc026298a78aa8b6639dcd829baf9862 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 12 六月 2022 16:09:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 82 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 39 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 94f9e76..1d97bf2 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -41,7 +41,7 @@
[Route("Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill")]
[HttpGet]
- public object GetMESBeginStepWorkBill(string sWhere,string user)
+ public object GetMESBeginStepWorkBill(string sWhere, string user)
{
try
{
@@ -84,7 +84,7 @@
{
LogService.Write("鎵ц浜�1");
string sql1 = "select * from h_v_Sc_MESBeginWorkBillList_NEW where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESBeginWorkBillList_NEW");
}
@@ -802,7 +802,7 @@
oItemSub.HOtherItem4 = "";
oItemSub.HOtherItem5 = "";
oItemSub.HPackType = "";
- oItemSub.HBatchNo="";
+ oItemSub.HBatchNo = "";
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//oItemSub.HRepairID = 0; //缁翠慨椤圭洰
//oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
@@ -1028,7 +1028,7 @@
oCN.BeginTran();
//鍒犻櫎宸ュ簭姹囨姤瀛愯〃
- string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='"+HInterID+"' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
+ string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
oCN.RunProc(sql1);
//鍒犻櫎宸ュ簭姹囨姤涓昏〃
string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");
@@ -1057,7 +1057,7 @@
#region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
[Route("Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList")]
[HttpGet]
- public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm,string HProcID)
+ public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm, string HProcID)
{
ListModels oListModels = new ListModels();
try
@@ -1125,7 +1125,7 @@
//model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
model.HMainSourceInterID = HICMOInterID;
model.HMainSourceEntryID = HICMOEntryID;
-
+
//oWebs.Timeout = 30000;
bool flag = oWebs.set_SaveICMOProductReportBill_LayuiYqn(model, workcode, HSourceID, sHSourceType, HProcID, ref DBUtility.ClsPub.sErrInfo);
@@ -1182,7 +1182,7 @@
try
{
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Edit",1,false,user))
+ if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1467,13 +1467,12 @@
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 鍗曟嵁鍙�='"+ sBillBarCode + "'", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select f1.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f1.F_zzzz_Text4 閿�鍞墿鏂欏悕绉�,* from h_v_IF_ICMOBillList a left join AIS20200908101915zs..T_PRD_MOENTRY f1 on a.HERPEntryID=f1.FENTRYID where convert(varchar(50),a.hmainid)+'-'+convert(varchar(50),a.HEntryID)='" + sBillBarCode + "'", "h_v_IF_ICMOBillList");
if (ds.Tables[0].Rows.Count > 0)
{
-
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "姝ゆ簮鍗曚笉瀛樺湪锛�";
+ objJsonResult.Message = "杩斿洖婧愬崟鎴愬姛锛�";
objJsonResult.data = ds;
return objJsonResult;
}
@@ -1526,7 +1525,7 @@
int sPeriod = 0;
string BillNo = "";
long MainId = 0;
- long EntyID = 0;
+ string EntyID = "";
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
{
objJsonResult.code = "0";
@@ -1586,34 +1585,39 @@
if (oBill.omodel.HInterID == 0)
{
oCN.BeginTran();
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
+ oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FCONVEYDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);
//璁块棶閲戣澏
- var loginRet = InvokeHelper.Login();
- var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
- if (isSuccess == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
- objJsonResult.data = null;
- return objJsonResult;
- }
- var json = new
- {
- //CreateOrgId = 0,
- Numbers = BillNo,
- Ids = MainId,
- PkEntryIds = EntyID
- };
- var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
- if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //var loginRet = InvokeHelper.Login();
+ //var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //if (isSuccess == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //var json = new
+ //{
+ // //CreateOrgId = 0,
+ // Numbers = BillNo,
+ // //Ids = (EntyID).Split('-')[0],
+ // PkEntryIds = (EntyID).Split('-')[1]
+ //};
+ //Console.Write("json=" + json);
+ //var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
+ //if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ ////鎵ц淇濆瓨
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
if (bResult)
{
objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
@@ -1651,4 +1655,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1