From e52d742392924babececb7e93240701d7a26faaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Tue, 28 Oct 2025 10:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BA=A7=E5=87=BA=E6=A0=87=E7=AD=BE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rollNoReview/data/SFDCRollsOutData.java | 98 +++++++++++++++++++ .../ProductionReportController.java | 23 +++++ .../shopOrder/dao/ProductionReportMapper.java | 3 + .../Impl/ProductionReportServiceImpl.java | 8 ++ .../service/ProductionReportService.java | 2 + .../shopOrder/ProductionReportMapper.xml | 48 +++++++++ 6 files changed, 182 insertions(+) diff --git a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java index 2e46b8d..d6d5d23 100644 --- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java +++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java @@ -1,6 +1,10 @@ package com.gaotao.modules.rollNoReview.data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.sql.Timestamp; +import java.util.Date; public class SFDCRollsOutData { private String Site; @@ -33,6 +37,100 @@ public class SFDCRollsOutData { private String CQCPassFlag; private String CQCInspectedFlag; private String CQCNeedInspectFlag; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdDate2; + private Timestamp date1; + private Timestamp date2; + private String Reportedby; + //消耗工单号 + private String consumeOrderNo; + //消耗派工单号 + private String consumeSeqNo; + //消耗工序号 + private String consumeItemNo; + private String parentRollNo; + private String parentRollType; + private String finalStatus; + public Date getCreatedDate2() { + return createdDate2; + } + + public void setCreatedDate2(Date createdDate2) { + this.createdDate2 = createdDate2; + } + public Timestamp getDate1() { + return date1; + } + + public void setDate1(Timestamp date1) { + this.date1 = date1; + } + + public Timestamp getDate2() { + return date2; + } + + public void setDate2(Timestamp date2) { + this.date2 = date2; + } + + public String getReportedby() { + return Reportedby; + } + + public void setReportedby(String reportedby) { + Reportedby = reportedby; + } + + public String getFinalStatus() { + return finalStatus; + } + + public void setFinalStatus(String finalStatus) { + this.finalStatus = finalStatus; + } + + public String getParentRollNo() { + return parentRollNo; + } + + public void setParentRollNo(String parentRollNo) { + this.parentRollNo = parentRollNo; + } + + public String getParentRollType() { + return parentRollType; + } + + public void setParentRollType(String parentRollType) { + this.parentRollType = parentRollType; + } + + public String getConsumeOrderNo() { + return consumeOrderNo; + } + + public void setConsumeOrderNo(String consumeOrderNo) { + this.consumeOrderNo = consumeOrderNo; + } + + public String getConsumeSeqNo() { + return consumeSeqNo; + } + + public void setConsumeSeqNo(String consumeSeqNo) { + this.consumeSeqNo = consumeSeqNo; + } + + public String getConsumeItemNo() { + return consumeItemNo; + } + + public void setConsumeItemNo(String consumeItemNo) { + this.consumeItemNo = consumeItemNo; + } + public String getSite() { return Site; } diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java index eb530c4..4cca832 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java @@ -2,6 +2,8 @@ package com.gaotao.modules.shopOrder.controller; import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; +import com.gaotao.modules.schedule.data.SfdcRollData; import com.gaotao.modules.shopOrder.entity.*; import com.gaotao.modules.shopOrder.service.ProductionReportService; import com.gaotao.modules.shopOrder.service.ShopOrderService; @@ -160,6 +162,27 @@ public class ProductionReportController { return map; } + /** + * 订单产出标签报表--查询 + * @param + * @return + */ + @PostMapping(value="/searchSfdcRollsReport") + @ResponseBody + public Object searchSfdcRollsReport(@RequestBody SFDCRollsOutData indata){ + Map map = new HashMap<>(); + try { + List result = productionReportService.searchSfdcRollsReport(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } + //=============查询-CQC检验记录=================== /** * 查询-CQC检验记录 diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java index 4f2800e..6c6e731 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java +++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java @@ -1,6 +1,7 @@ package com.gaotao.modules.shopOrder.dao; import com.gaotao.modules.base.entity.WorkCenterData; +import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; import com.gaotao.modules.shopOrder.entity.*; import org.apache.ibatis.annotations.Mapper; @@ -140,4 +141,6 @@ public interface ProductionReportMapper { * @throw */ List searchReportInOrderNoData(SearchReportInOrderNoData indata); + + List searchSfdcRollsReport(SFDCRollsOutData indata); } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java index e9b6d17..594dfb6 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java @@ -8,6 +8,7 @@ import com.gaotao.modules.base.entity.CalendarData; import com.gaotao.modules.base.entity.SiteData; import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; import com.gaotao.modules.schedule.mapper.ProcedureMapper; import com.gaotao.modules.shopOrder.dao.ProductionReportMapper; import com.gaotao.modules.shopOrder.entity.*; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -169,4 +171,10 @@ public class ProductionReportServiceImpl implements ProductionReportService { responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); return responseData; } + + @Override + public List searchSfdcRollsReport(SFDCRollsOutData indata) { + List result = productionReportMapper.searchSfdcRollsReport(indata); + return result; + } } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java index 9d08e76..7590c61 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java @@ -2,6 +2,7 @@ package com.gaotao.modules.shopOrder.service; import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; import com.gaotao.modules.shopOrder.entity.*; import java.util.List; @@ -111,4 +112,5 @@ public interface ProductionReportService { */ ResponseData cancelReport(SearchProductionLineOutputReportData inData); + List searchSfdcRollsReport(SFDCRollsOutData indata); } diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index 627934f..e288223 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -228,4 +228,52 @@ Order by T.Orderno + \ No newline at end of file