diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 8afbe552..41f1b24f 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1304,7 +1304,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } } } - proOrderWorkorderMapper.addBatchPallet(dtos); + if(!CollectionUtils.isEmpty(dtos)){ + proOrderWorkorderMapper.addBatchPallet(dtos); + } }else{ dtos.addAll(dtos0); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index 4ca41345..7516fb5c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -40,15 +40,15 @@ public class QcCheckReportIncomeController extends BaseController { @GetMapping("/list") public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { - qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 23:59:59"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { +// qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 23:59:59"; +// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 4d678ccc..f6b7da61 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -215,6 +215,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String pgzr;//质量主管 private String oaFactoryF;//异常范围 private String sccj; + private String bz; + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } public String getSccj() { return sccj; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index acbc55e5..ba1a88d6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -206,6 +206,15 @@ public class QcCheckTaskProduce extends BaseEntity { private String confirmRemark; private String confirmTime; private String shiftId; + private String bz;//备注 + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } public String getShiftId() { return shiftId; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index 8f8612cb..b8ac67e2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -85,4 +85,6 @@ public interface QcCheckReportIncomeMapper { List getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); List getBatchsByTaskId(String recordId); + + QcCheckTaskProduce getLastXJ(QcCheckTaskProduce qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index 27e55801..b52ca5b1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -197,6 +197,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { List dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); for (QcCheckTaskDetail dto : dtos) { + if(StringUtils.isNotBlank(dto.getSamplePlan())){ + dto.setSamplePlan(dto.getSamplePlan().replace(".00","")); + } + List files = qmsFileMapper.getBaseFileBatch(dto.getRecordId()); if (!CollectionUtils.isEmpty(files)) { dto.setFiles(files); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 6dfb5cd8..977a8a41 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -221,6 +221,11 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); + QcCheckTaskProduce lastXJ = qcCheckReportIncomeMapper.getLastXJ(qcCheckTaskProduce); + if(lastXJ!=null){ + produce.setBz(lastXJ.getBz()); + } + List lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); if (!CollectionUtils.isEmpty(lastProduces)) { produce.setProductType(lastProduces.get(0).getProductType()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 6a7e1cbb..6b471a58 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -689,7 +689,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); - qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3()); + qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); logger.info("qc_check_task:"+n); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 2738f0b1..7229c15c 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -263,6 +263,15 @@ where qct.record_id = #{recordId} order by powb.batch_code + insert into qc_check_task diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index d72e0e31..a363ca2d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -314,7 +314,7 @@ income_batch_no = #{incomeBatchNo}, remark = #{remark}, reason = #{reason}, - attr3 = #{attr3}, + bz = #{bz}, check_result = #{checkResult}, update_by = #{updateBy}, update_time = #{updateTime}