diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index 90f6810..c2b82cd 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -571,4 +571,19 @@ public class DailyPlanController { SOOpsTransferData data =dailyPlanService.getTransPrintData(inData); return R.ok().put("row", data); } + + /** + * @Description 打印物料标识卡数据 + * @Title getPartCardPrintData + * @param + * @author rq + * @date 2021/8/13 14:08 + * @return double + * @throw + */ + @PostMapping("/getPartCardPrintData") + public Object getPartCardPrintData(@RequestBody PartCardPrintData inData){ + PartCardPrintData data =dailyPlanService.getPartCardPrintData(inData); + return R.ok().put("row", data); + } } diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java index 37f0cfb..c885d0e 100644 --- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java +++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java @@ -404,4 +404,15 @@ public interface DailyPlanMapper { * @throw */ List transFerSearch(SOOpsTransferData inData); + + /** + * @Description 打印物料标识卡数据 + * @Title getPartCardPrintData + * @param inData + * @author rq + * @date 2022/9/29 17:45 + * @return List + * @throw + */ + PartCardPrintData getPartCardPrintData(PartCardPrintData inData); } diff --git a/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java b/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java new file mode 100644 index 0000000..50ae754 --- /dev/null +++ b/src/main/java/com/heai/modules/production/entity/PartCardPrintData.java @@ -0,0 +1,119 @@ +package com.heai.modules.production.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class PartCardPrintData { + private String site; + private String orderNo; + private int seqNo; + private String partNo; + private String partDesc; + private BigDecimal qtyRequired; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date sScheduledDate; + private String operatorName; + private String techInfo; + private String remark; + private Float toExpireDays; + private String userId; + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public int getSeqNo() { + return seqNo; + } + + public void setSeqNo(int seqNo) { + this.seqNo = seqNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public BigDecimal getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(BigDecimal qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public Date getsScheduledDate() { + return sScheduledDate; + } + + public void setsScheduledDate(Date sScheduledDate) { + this.sScheduledDate = sScheduledDate; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getTechInfo() { + return techInfo; + } + + public void setTechInfo(String techInfo) { + this.techInfo = techInfo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Float getToExpireDays() { + return toExpireDays; + } + + public void setToExpireDays(Float toExpireDays) { + this.toExpireDays = toExpireDays; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } +} diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java index b9444b9..73656bc 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -438,4 +438,14 @@ public interface DailyPlanService { * @throw */ SOOpsTransferData getTransPrintData(SOOpsTransferData inData); + /** + * @Description 打印物料标识卡数据 + * @Title getPartCardPrintData + * @param inData + * @author rq + * @date 2022/9/29 17:45 + * @return List + * @throw + */ + PartCardPrintData getPartCardPrintData(PartCardPrintData inData); } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 5ac8f39..af37d70 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -798,4 +798,9 @@ public class DailyPlanServiceImpl implements DailyPlanService { public SOOpsTransferData getTransPrintData(SOOpsTransferData inData){ return dailyPlanMapper.getTransData(inData.getSite(),inData.getTransNo()); } + + @Override + public PartCardPrintData getPartCardPrintData(PartCardPrintData inData){ + return dailyPlanMapper.getPartCardPrintData(inData); + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 3a67f04..5e41904 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -526,4 +526,13 @@ ORDER BY a.TransDate + + + \ No newline at end of file