From 9084fac6b0907a2d56b7ba012193bce7d48cc2fb Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期五, 13 五月 2022 12:38:30 +0800
Subject: [PATCH] 不良率报表过滤条件调整
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..8a166a1 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"
@@ -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 * from h_v_IF_ICMOBillList where convert(varchar(50),hmainid)+'-'+convert(varchar(50),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,7 +1585,6 @@
if (oBill.omodel.HInterID == 0)
{
oCN.BeginTran();
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
//璁块棶閲戣澏
var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
@@ -1602,18 +1600,21 @@
{
//CreateOrgId = 0,
Numbers = BillNo,
- Ids = MainId,
- PkEntryIds = EntyID
+ Ids = (EntyID).Split('-')[0],
+ PkEntryIds = (EntyID).Split('-')[1]
};
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
--
Gitblit v1.9.1