diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index e9a55742..81798a82 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -25,6 +25,8 @@ public class LabelPrintDto implements Serializable { private String supplier; //批次号 private String batch; + // 物料条码 + private String label; //在制品标签参数 //工作指令 @@ -104,6 +106,14 @@ public class LabelPrintDto implements Serializable { this.batch = batch; } + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + public String getWorkOrder() { return workOrder; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java index f476f625..349015b1 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java @@ -216,9 +216,11 @@ public class SurplusReturnServiceImpl extends ServiceImpl