wilson
/
ha-mes-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0412更新

master
ruanqi 11 months ago
parent
a71ebc8956
commit
fa779ca32d
1 changed files with 11 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/main/resources/mapper/production/DailyPlanMapper.xml

21
src/main/resources/mapper/production/DailyPlanMapper.xml
View File

@ -8,8 +8,8 @@
<select id="getShopOrderData" resultType="com.heai.modules.production.entity.ShopOrderData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
select a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) as weightFactor,
Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) as weight
P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size,P.NetWeight/1000 as weightFactor,
Round(isnull(P.NetWeight/1000,1)*a.LotSize,2) as weight
,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc
FROM ShopOrder a
LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
@ -53,7 +53,7 @@
</if>
AND a.PartNo like 'SP%'
</where>
order by a.PlanStartDate
order by case when dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) in ('变更订单','加急订单') then 1 else 2 end , a.PlanStartDate
</select>
<select id="getGenerateReportList" resultType="com.heai.modules.production.entity.GenerateReportData">
@ -230,8 +230,8 @@
<select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
select a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,a.MaterialSplitFlag,a.RepairSOFlag,
P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor,
Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate,
S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,P.NetWeight/1000 weightFactor,
Round(isnull(P.NetWeight/1000,1)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate,
dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,
Round((a.LotSize- S.qtyReported)/case when s.MachRunFactor=0 then 1000000 else s.MachRunFactor end ,1) lastTime
,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc
@ -292,7 +292,8 @@
and a.E_Levels = #{eLevels}
</if>
</where>
order by a.PlanStartDate desc,s.itemNo
order by case when dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) in ('变更订单','加急订单') then 1 else 2 end ,
a.PlanStartDate desc,s.itemNo
</select>
<select id="getShopOrderRoutingVPData" resultType="ShopOrderRoutingData">
select t.OrderNo as liuhuaOrderNo,t.site,SO.PartNo,dbo.Get_Part_SpecDesc(t.site,T.partno) as liuhuaPartDescSpec,t.partNo as liuhuaPartNo
@ -357,7 +358,7 @@
and dbo.Get_Part_SpecDesc(t.site,T.partno) like #{liuhuaPartDescSpec}
</if>
</where>
order by h.OrderDate ,so.partNo,s.itemNo
order by case when dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo) in ('变更订单','加急订单') then 1 else 2 end , h.OrderDate ,so.partNo,s.itemNo
</select>
<update id="updateSOTaskCombineTime">
update SOTaskOrderHeader set CombineTime = GetDate() where site=#{site} and orderNo=#{orderNo}
@ -366,8 +367,8 @@
<select id="getSOTastRoutingData" resultType="ShopOrderRoutingData">
select a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,dbo.Get_PartValue(a.site,a.PartNo,'equipment') as equipment,so.RepairSOFlag,
P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime,
S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight,
dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate
S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(isnull(P.NetWeight/1000,1)*a.OrderQty,2) as weight,
P.NetWeight/1000 as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate
,a.comBineTime lastStartDate,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,dbo.Get_PartValue( a.site,a.PartNo,'TIME') liuHuaShiJian,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') yangHuaJiType
,case when dbo.Get_PartNumberValue( a.site,a.PartNo,'PLAN-QUANTITY') is not null and dbo.Get_PartNumberValue( a.site,a.PartNo,'CAVITY') is not null
then CEILING((a.OrderQty-isnull(SL.scheduledQty,0))/(dbo.Get_PartNumberValue( a.site,a.PartNo,'PLAN-QUANTITY')*dbo.Get_PartNumberValue( a.site,a.PartNo,'CAVITY'))) else null end as banQty,
@ -429,7 +430,7 @@
AND #{endDate4} >= cod.PlanShipDate
</if>
</where>
order by a.OrderDate desc,s.itemNo
order by case when dbo.Get_E_OriginalOrderTypeDesc(so.site, so.OrderNo) in ('变更订单','加急订单') then 1 else 2 end , a.OrderDate desc,s.itemNo
</select>
<select id="getWorkCenterOperatorList" resultType="OperatorData">

Write Preview
Loading…
Cancel
Save