From 9d33c8d24a9567801a17c25ba16bf26bb61a9d5e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 23 五月 2022 08:56:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 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 8a166a1..a0338de 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,7 +1467,7 @@
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where convert(varchar(50),hmainid)+'-'+convert(varchar(50),HEntryID)='" + 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";
@@ -1600,9 +1600,10 @@
{
//CreateOrgId = 0,
Numbers = BillNo,
- Ids = (EntyID).Split('-')[0],
+ //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")
{
--
Gitblit v1.9.1