diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java index 8a296fc..a7d4d36 100644 --- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java +++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java @@ -37,3 +37,4 @@ public class SoReceiveCasesData extends SoReceiveCases { + diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java index 259483b..3fb295c 100644 --- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java +++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java @@ -180,3 +180,4 @@ public class SoReceiveCases { + diff --git a/src/main/java/com/gaotao/modules/schedule/entity/ProductionReportData.java b/src/main/java/com/gaotao/modules/schedule/entity/ProductionReportData.java index 423ea5d..baa7872 100644 --- a/src/main/java/com/gaotao/modules/schedule/entity/ProductionReportData.java +++ b/src/main/java/com/gaotao/modules/schedule/entity/ProductionReportData.java @@ -18,6 +18,8 @@ public class ProductionReportData implements Serializable { private Float goodQty; // 良品数量 private Float defectQty; // 不良数量 private Float totalQty; // 总数量 + private Float surfaceLossQty; // 面损数量 + private Float poorPerformanceQty; // 性能不良数量 private Date reportTime; // 报工时间 private String operator; // 操作员 private String remark; // 备注 @@ -109,6 +111,22 @@ public class ProductionReportData implements Serializable { public void setRemark(String remark) { this.remark = remark; } + + public Float getSurfaceLossQty() { + return surfaceLossQty; + } + + public void setSurfaceLossQty(Float surfaceLossQty) { + this.surfaceLossQty = surfaceLossQty; + } + + public Float getPoorPerformanceQty() { + return poorPerformanceQty; + } + + public void setPoorPerformanceQty(Float poorPerformanceQty) { + this.poorPerformanceQty = poorPerformanceQty; + } } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 5dbad40..1b55b33 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -3463,7 +3463,8 @@ public class ScheduleServiceImpl implements ScheduleService { } //存储过程 调用存储过程 创建分卷 - Map resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId); + String remark = inData.getRemark(); + Map resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark); //判断结果是否成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if ("400".equalsIgnoreCase(resultCode)) { @@ -3494,8 +3495,29 @@ public class ScheduleServiceImpl implements ScheduleService { ProductionReportData report = new ProductionReportData(); report.setRowNumber(Integer.valueOf(String.valueOf(rowMap.get("rowNumber")))); report.setGoodQty(Float.valueOf(String.valueOf(rowMap.get("goodQty")))); + + // 设置面损数量 + if (rowMap.get("surfaceLossQty") != null) { + report.setSurfaceLossQty(Float.valueOf(String.valueOf(rowMap.get("surfaceLossQty")))); + } else { + report.setSurfaceLossQty(0f); + } + + // 设置性能不良数量 + if (rowMap.get("poorPerformanceQty") != null) { + report.setPoorPerformanceQty(Float.valueOf(String.valueOf(rowMap.get("poorPerformanceQty")))); + } else { + report.setPoorPerformanceQty(0f); + } + report.setDefectQty(Float.valueOf(String.valueOf(rowMap.get("defectQty")))); report.setTotalQty(Float.valueOf(String.valueOf(rowMap.get("totalQty")))); + + // 设置备注 + if (rowMap.get("remark") != null) { + report.setRemark(String.valueOf(rowMap.get("remark"))); + } + reportList.add(report); } @@ -3513,9 +3535,9 @@ public class ScheduleServiceImpl implements ScheduleService { * @Author LR * @Description 调用存储过程 创建分卷 * @DateTime 2022/2/17 14:51 - * @Param [site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, username] + * @Param [site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark] **/ - public Map workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String operatorId) { + public Map workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String operatorId, String remark) { List params = new ArrayList<>(); params.add(site); params.add(orderNo); @@ -3525,6 +3547,7 @@ public class ScheduleServiceImpl implements ScheduleService { params.add(rollQty); params.add(rollNums); params.add(operatorId); + params.add(remark); // 添加备注参数 //调用存储过程 List> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_action", params); //处理返回的结果 diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 8646732..0946fda 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -474,7 +474,7 @@ INSERT INTO ProductionReport - (site, order_no, seq_no, roll_no, row_number, good_qty, defect_qty, total_qty, ReportTime, operator, Remark) + (site, order_no, seq_no, roll_no, row_number, good_qty, surface_loss_qty, poor_performance_qty, defect_qty, total_qty, ReportTime, operator) VALUES ( @@ -484,11 +484,12 @@ #{item.rollNo}, #{item.rowNumber}, #{item.goodQty}, + #{item.surfaceLossQty}, + #{item.poorPerformanceQty}, #{item.defectQty}, #{item.totalQty}, GETDATE(), - #{item.operator}, - #{item.remark} + #{item.operator} )