Browse Source

2025-11-11

优化
master
fengyuan_yang 2 months ago
parent
commit
956bd911fd
  1. 8
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  2. 28
      src/main/resources/mapper/schedule/ScheduleMapper.xml

8
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@ -282,10 +282,10 @@ public class ScheduleServiceImpl implements ScheduleService {
@Override @Override
public List<OrderBomData> getOrderBomByCon(SearchScheduleData inData) { public List<OrderBomData> getOrderBomByCon(SearchScheduleData inData) {
String site = inData.getSite();
//首先查询referenceCustomerId
String referenceCustomerId = scheduleMapper.getReferenceCustomerId(site);
inData.setReferenceCustomerId(referenceCustomerId);
// String site = inData.getSite();
// //首先查询referenceCustomerId
// String referenceCustomerId = scheduleMapper.getReferenceCustomerId(site);
// inData.setReferenceCustomerId(referenceCustomerId);
//判断是否查询当前卷的 //判断是否查询当前卷的
boolean currentRollFlag = inData.isCurrentRollFlag(); boolean currentRollFlag = inData.isCurrentRollFlag();
if (!currentRollFlag) { if (!currentRollFlag) {

28
src/main/resources/mapper/schedule/ScheduleMapper.xml

@ -747,27 +747,27 @@
<select id="getOrderBomByCon" parameterType="SearchScheduleData" resultType="OrderBomData"> <select id="getOrderBomByCon" parameterType="SearchScheduleData" resultType="OrderBomData">
SELECT vss.Site site, vss.OrderNo orderNo, vss.ItemNo itemNo, vss.ComponentPartNo componentPartNo, SELECT vss.Site site, vss.OrderNo orderNo, vss.ItemNo itemNo, vss.ComponentPartNo componentPartNo,
/*动态sql语句*/ /*动态sql语句*/
<if test="referenceCustomerId != null and referenceCustomerId != ''">
<choose>
<when test="referenceCustomerId != null and referenceCustomerId != ''">
ISNULL(rpi.ReferencePartDesc, P.PartDescription) partDesc, '' partSpec,
</when>
<otherwise>
<!-- <if test="referenceCustomerId != null and referenceCustomerId != ''">-->
<!-- <choose>-->
<!-- <when test="referenceCustomerId != null and referenceCustomerId != ''">-->
<!-- ISNULL(rpi.ReferencePartDesc, P.PartDescription) partDesc, '' partSpec,-->
<!-- </when>-->
<!-- <otherwise>-->
P.PartDescription partDesc, P.Spec partSpec, P.PartDescription partDesc, P.Spec partSpec,
</otherwise>
</choose>
</if>
<!-- </otherwise>-->
<!-- </choose>-->
<!-- </if>-->
P.UMid partUm, vss.QtyAssembly qtyAssembly, vss.QtyFixedScrapt qtyFixedScrapt, vss.ScraptFactor scraptFactor, P.UMid partUm, vss.QtyAssembly qtyAssembly, vss.QtyFixedScrapt qtyFixedScrapt, vss.ScraptFactor scraptFactor,
vss.Remark remark, vss.Remark remark,
vss.QtyRequired qtyRequired, vss.QtyIssue qtyIssue, vss.IssueDate issueDate, vss.QtyReserved qtyReserved, vss.QtyRequired qtyRequired, vss.QtyIssue qtyIssue, vss.IssueDate issueDate, vss.QtyReserved qtyReserved,
vss.MatGroup matGroup, vss.RMType_DB rmTypeDb vss.MatGroup matGroup, vss.RMType_DB rmTypeDb
FROM dbo.view_SAP_SOBOM vss FROM dbo.view_SAP_SOBOM vss
/*动态sql语句*/ /*动态sql语句*/
<if test="referenceCustomerId != null and referenceCustomerId != ''">
LEFT JOIN ReferencePartInfo rpi ON vss.Site = rpi.Site AND vss.ComponentPartNo = rpi.PartNo AND
rpi.CustomerID = #{referenceCustomerId}
AND (rpi.FGPartNo = #{partNo} OR rpi.FGPartNo = '全部')
</if>
<!-- <if test="referenceCustomerId != null and referenceCustomerId != ''">-->
<!-- LEFT JOIN ReferencePartInfo rpi ON vss.Site = rpi.Site AND vss.ComponentPartNo = rpi.PartNo AND-->
<!-- rpi.CustomerID = #{referenceCustomerId}-->
<!-- AND (rpi.FGPartNo = #{partNo} OR rpi.FGPartNo = '全部')-->
<!-- </if>-->
LEFT JOIN Part P ON vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo LEFT JOIN Part P ON vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo
<where> <where>
vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo

Loading…
Cancel
Save