Browse Source

修改

master
ruanqi 2 years ago
parent
commit
a8b46e43af
  1. 18
      src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java
  2. 3
      src/main/resources/mapper/production/DailyPlanMapper.xml

18
src/main/java/com/jianteng/modules/Schedule/entity/ShopOrderRoutingData.java

@ -65,6 +65,8 @@ public class ShopOrderRoutingData extends ShopOrderData{
private Double weight; private Double weight;
private Float weightFactor; private Float weightFactor;
private String userId; private String userId;
private String soremark;
private String planTypeDesc;
private String workCenterDesc; private String workCenterDesc;
public float getItemNo() { public float getItemNo() {
return itemNo; return itemNo;
@ -350,4 +352,20 @@ public class ShopOrderRoutingData extends ShopOrderData{
public void setWorkCenterDesc(String workCenterDesc) { public void setWorkCenterDesc(String workCenterDesc) {
this.workCenterDesc = workCenterDesc; this.workCenterDesc = workCenterDesc;
} }
public String getSoremark() {
return soremark;
}
public void setSoremark(String soremark) {
this.soremark = soremark;
}
public String getPlanTypeDesc() {
return planTypeDesc;
}
public void setPlanTypeDesc(String planTypeDesc) {
this.planTypeDesc = planTypeDesc;
}
} }

3
src/main/resources/mapper/production/DailyPlanMapper.xml

@ -227,7 +227,8 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId,dispatched_hunlian FROM SOTaskOrde
select a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize, select a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,
P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime, 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, S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,
so.needDate,dbo.Get_WorkCenterDesc( a.site,s.workCenterNo) WorkCenterDesc
so.needDate,dbo.Get_WorkCenterDesc( a.site,s.workCenterNo) WorkCenterDesc,so.remark soremark,
dbo.Get_ShopOrder_PlanerDesc(a.site,so.Planner) planTypeDesc
FROM SOTaskOrderHeader a FROM SOTaskOrderHeader a
LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
LEFT JOIN v_SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1 LEFT JOIN v_SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1

Loading…
Cancel
Save