Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页+去掉订单修改功能

Browse Source
master
zhaoxiaolin 10 months ago
parent 6c71264935
commit 5354d2f617
7 changed files with 141 additions and 15 deletions
Show Stats Download Patch File Download Diff File

19
op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.datasource.creator.DynamicDatasourceCreator;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartDto;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.system.api.domain.DataSourcePropertyDTO;
import com.op.system.api.domain.SysUser;
@ -249,12 +250,28 @@ public class MesReportWorkController extends BaseController {
return mesReportWorkService.getWorkcenterList(mesDailyReport);
}
/**首页柱状图**/
/**首页柱状图（产品太多了，有点乱，不用了）**/
@GetMapping("/getLineChartData")
public LineChartDto getLineChartData(MesReportProduction mesReportProduction) {
return mesReportWorkService.getLineChartData(mesReportProduction);
}
/**首页-各线体当日计划产量(横向柱状图)**/
@PostMapping("/getLineProData")
public List<MesReportWork> getLineProData(MesReportWork dto) {
return mesReportWorkService.getLineProData(dto);
}
/**当月各日实际产量（单折线图）**/
@GetMapping("/getMonthProData")
public LineChartDto getMonthProData(MesReportProduction mesReportProduction) {
return mesReportWorkService.getMonthProData(mesReportProduction);
}
/**首页-当日产品产量（饼图）**/
@PostMapping("/getProductProData")
public List<MesReportWork> getProductProData(MesReportWork dto) {
return mesReportWorkService.getProductProData(dto);
}
/**
* 小时产量表头

9
op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LineChartDto.java
Unescape Escape View File

@ -12,6 +12,15 @@ public class LineChartDto {
private List<String> seriesNames;
private List<String> xAxisDatas;
private List<LineChartSeriesDto> seriesDatas;
private List<String> yDatas;
public List<String> getyDatas() {
return yDatas;
}
public void setyDatas(List<String> yDatas) {
this.yDatas = yDatas;
}
public List<String> getSeriesNames() {
return seriesNames;

8
op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.device.EquEquipmentDTO;
@ -88,6 +89,9 @@ public interface MesReportWorkMapper {
@MapKey("nameDate")
Map<String, MesReportProduction> getLineChartsDatas(MesReportProduction mesReportProduction);
@MapKey("name")
Map<String, MesReportProduction> getDayOfMonthDatas(MesReportProduction mesReportProduction);
List<String> getLineChartsNames(MesReportProduction mesReportProduction);
@MapKey("equCodeHour")
@ -147,4 +151,8 @@ public interface MesReportWorkMapper {
void updateReportRemark(@Param("list") List<MesReportWork> mesReportWork);
BigDecimal getReportRate(String productCode);
List<MesReportWork> getLineProData(MesReportWork dto);
List<MesReportWork> getProductProData(MesReportWork dto);
}

7
op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.op.common.core.domain.R;
import com.op.common.core.web.domain.AjaxResult;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartDto;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.device.EquEquipmentDTO;
@ -115,4 +116,10 @@ public interface IMesReportWorkService {
int deleteBomRowNow(String id);
List<MesReportWorkConsume> getWarehouseList(MesReportWorkConsume workConsume);
List<MesReportWork> getLineProData(MesReportWork dto);
List<MesReportWork> getProductProData(MesReportWork dto);
LineChartDto getMonthProData(MesReportProduction mesReportProduction);
}

47
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
Unescape Escape View File

@ -464,6 +464,53 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
lineChartDto.setSeriesDatas(seriesDatas);
return lineChartDto;
}
@Override
@DS("#header.poolName")
public List<MesReportWork> getLineProData(MesReportWork dto) {
List<MesReportWork> dtos = mesReportWorkMapper.getLineProData(dto);
return dtos;
}
@Override
@DS("#header.poolName")
public List<MesReportWork> getProductProData(MesReportWork dto) {
List<MesReportWork> dtos = mesReportWorkMapper.getProductProData(dto);
return dtos;
}
@Override
public LineChartDto getMonthProData(MesReportProduction mesReportProduction) {
LineChartDto lineChartDto = new LineChartDto();
Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime();
calendar.set(Calendar.DAY_OF_MONTH, 1);
Date firstDayOfMonth = calendar.getTime();
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String startTime = dateFormat.format(firstDayOfMonth);
String endTime = dateFormat.format(now);
mesReportProduction.setProductDateStart(startTime);
mesReportProduction.setProductDateEnd(endTime);
//日期名称数组
List<String> xAxisDatas = getDays(startTime,endTime);
lineChartDto.setxAxisDatas(xAxisDatas);
Map<String,MesReportProduction> productdatas = mesReportWorkMapper.getLineChartsDatas(mesReportProduction);
//值
List<String> datas = new ArrayList<>();
for(String dayStr:xAxisDatas) {
MesReportProduction data0 = productdatas.get(dayStr);
if (data0 != null) {
datas.add(data0.getQuantity());
} else {
datas.add("0");
}
}
lineChartDto.setyDatas(datas);
return lineChartDto;
}
@DS("#header.poolName")
@Override
public List<HashMap> getHourProductionList(MesHourReport mesHourReport) {

40
op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
Unescape Escape View File

@ -303,10 +303,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where
CONVERT(varchar(10),feedback_time, 120) >= #{productDateStart}
and #{productDateEnd} >= CONVERT(varchar(10),feedback_time, 120)
and parent_order = '0'
and parent_order = '0' and del_flag = '0'
)mrw
group by mrw.nameDate,mrw.productCode,mrw.productName,mrw.feedbackTime
</select>
<select id="getDayOfMonthDatas" resultType="com.op.mes.domain.MesReportProduction">
select mrw.nameDate,
mrw.feedbackTime,
sum(mrw.quantity) quantity
from(
select
CONVERT(varchar(10),feedback_time, 120) nameDate,
CONVERT(varchar(10),feedback_time, 120) feedbackTime,
quantity_feedback quantity
from mes_report_work
where
CONVERT(varchar(10),feedback_time, 120) >= #{productDateStart}
and #{productDateEnd} >= CONVERT(varchar(10),feedback_time, 120)
and parent_order = '0' and del_flag = '0'
)mrw
group by mrw.nameDate,mrw.feedbackTime
</select>
<select id="getLineChartsNames" resultType="java.lang.String">
select
distinct mrw.product_name productName
@ -702,6 +719,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where product_code = #{productCode}
and del_flag = '0'
</select>
<select id="getLineProData" resultType="com.op.mes.domain.MesReportWork">
select * from(
select pow.workorder_name,
sum(pow.quantity_split) quantitySplit,
be.equipment_name machineName
from pro_order_workorder pow
left join base_equipment be on be.equipment_code = pow.workorder_name
where pow.product_date = #{productDate} and pow.parent_order = '0' and pow.del_flag='0' and pow.workorder_name is not null
GROUP BY pow.workorder_name,be.equipment_name
) t
order by t.quantitySplit desc
</select>
<select id="getProductProData" resultType="com.op.mes.domain.MesReportWork">
select pow.product_code productCode,
sum(pow.quantity_split) quantitySplit,
pow.product_name productName
from pro_order_workorder pow
where pow.product_date = CONVERT(DATE, GETDATE()) and pow.parent_order = '0' and pow.del_flag='0'
GROUP BY pow.product_code,pow.product_name
</select>
<insert id="insertMesReportWork" parameterType="MesReportWork">
insert into mes_report_work

26
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
Unescape Escape View File

@ -285,19 +285,19 @@ public class ProOrderServiceImpl implements IProOrderService {
//20231127,加入belongWorkOrder概念
belongWorkOrder = workOrder.getWorkorderCode();
//推送sap订单更新信息
SapShopOrderQuery sapChange = new SapShopOrderQuery();
sapChange.setAufnr(proOrder.getOrderCode());//母订单号
BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
.subtract(new BigDecimal(proOrder.getQuantitySplit()));
sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
logger.info("【成品订单拆分】母订单"+proOrder.getOrderCode()+
"订单数量变更：修改前"+proOrder.getQuantity()+","+
",已拆数量"+proOrder.getQuantitySplit()+","+
"给sap汇报数量"+newSapQuantityNum.toString());
R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据
logger.info("母订单"+proOrder.getOrderCode()+
"订单数量变更结果："+rSapChange.getCode()+","+rSapChange.getMsg());
// //推送sap订单更新信息
// SapShopOrderQuery sapChange = new SapShopOrderQuery();
// sapChange.setAufnr(proOrder.getOrderCode());//母订单号
// BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
// .subtract(new BigDecimal(proOrder.getQuantitySplit()));
// sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
// logger.info("【成品订单拆分】母订单"+proOrder.getOrderCode()+
// "订单数量变更：修改前"+proOrder.getQuantity()+","+
// ",已拆数量"+proOrder.getQuantitySplit()+","+
// "给sap汇报数量"+newSapQuantityNum.toString());
// R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据
// logger.info("母订单"+proOrder.getOrderCode()+
// "订单数量变更结果："+rSapChange.getCode()+","+rSapChange.getMsg());
}
workOrder.setProductCode(productNameInfo.getProdCode());
workOrder.setProductName(productNameInfo.getProdDesc());

Write Preview
Loading…
Cancel
Save