From 73596f23e5a5e1ef39900a650e092c1669925966 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 21 一月 2022 08:57:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 4 ++--
1 files changed, 2 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 4cac767..525b482 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"
@@ -607,9 +607,9 @@
,b.HSourceInterID,b.HSourceEntryID,b.HSourceBillNo,b.HSourceBillType
from Sc_ProcessReportMain a
inner join Sc_ProcessReportSub b on a.HInterID=B.HInterID
- inner join (select max(HProcNo) HProcNo
+ inner join (select max(HProcNo) HProcNo,max(HProcID) HProcID
from Sc_ProcessPlanSub group by HBillNo,HSourceBillNo)
- pr on b.HProcID=pr.HProcNo
+ pr on b.HProcID=pr.HProcID
left join Gy_Process p on b.HProcID=p.HItemID
left join Gy_Material m on a.HMaterID=m.hitemid
left join Gy_Source s on b.HSourceID=s.HItemID
--
Gitblit v1.9.1