更新打印

mes/src/main/java/com/ximai/mes/pro/domain/task/ProTask.java

@@ -315,6 +315,7 @@ public class ProTask extends BaseEntity {
 
     private String isExistTool = IS_EXIST_TOOL_NO;
 
+    private String idx;
     @ApiModelProperty("超报标识")
     private Boolean surpassState;
     public String getStatusName() {

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -46,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -567,6 +568,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
             printData.put("valueList",valueList);
             List<ProTask> tasks = proTaskMapper.selectByTaskIds(taskIds);
             List<String> taskBatchs = tasks.stream().map(proTask -> proTask.getTaskBatch()).distinct().collect(Collectors.toList());
+            int i = 1;
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             for (String taskBatch : taskBatchs){
                 List<ProTask> taskBatchTasks = proTaskMapper.selectByTaskBatch(taskBatch);
                 if(taskBatchTasks.size() > 0){
@@ -575,6 +578,11 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                     ProWorkorder proWorkorder = proWorkorderMapper.selectProWorkorderWorderCode(taskBatchTasks.get(0).getArrangeCode());
                     value.put("header",proWorkorder);
                     value.put("detail",taskBatchTasks);
+                    Map<String,Object> value1 = new HashMap<>();
+                    value.put("additional",value1);
+                    value1.put("size",i++);
+                    value1.put("date",simpleDateFormat.format(new Date()));
+                    value1.put("quantity",taskBatchTasks.get(0).getQuantity());
                 }
             }
             return printData;