标签打印模板修改

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;
     }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java

@@ -216,9 +216,11 @@ public class SurplusReturnServiceImpl extends ServiceImpl<SurplusReturnMapper, S
         labelPrintDto.setItemDescription(inventoryModel.getDescription());
         labelPrintDto.setSupplier(dataAttr);
         labelPrintDto.setBatch(surplusInventory);
+        labelPrintDto.setLabel(surplusInventory);
 
         printLog.setPrintParam(JSON.toJSONString(labelPrintDto));
         printLog.setInventory(surplusInventory);
+
         printLog.setItemBo(inventoryModel.getItemBo());
         printLog.setCreateUser(user);
         printLog.setCreatedDateTime(dateTime);

integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java

@@ -877,7 +877,9 @@ public class InterfaceServiceImpl implements InterfaceService {
             labelPrintDto.setItem(item);
             labelPrintDto.setItemDescription(itemModel.getDescription());
             labelPrintDto.setSupplier(supplier);
-            labelPrintDto.setBatch(inventory);
+            //labelPrintDto.setBatch(inventory);
+            labelPrintDto.setBatch(batch);
+            labelPrintDto.setLabel(inventory);
             labelPrintDtoList.add(labelPrintDto);