更新打印

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

@@ -318,6 +318,11 @@ public class ProTask extends BaseEntity {
     private String idx;
     @ApiModelProperty("超报标识")
     private Boolean surpassState;
+
+    private String expectStartDateString;
+
+    private String requestDateString;
+
     public String getStatusName() {
         return TaskStatusEnum.getStatusCn(this.getStatus());
     }

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

+package com.ximai.mes.pro.domain.task;
+
+import lombok.Data;
+
+@Data
+public class TaskProPrintData extends ProTask{
+    private String beginAndEndDate;
+}

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

@@ -574,8 +574,10 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
             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");
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
             for (String taskBatch : taskBatchs){
                 List<ProTask> taskBatchTasks = proTaskMapper.selectByTaskBatch(taskBatch);
+
                 if(taskBatchTasks.size() > 0){
                     Map<String,Object> value = new HashMap<>();
                     valueList.add( value);
@@ -584,16 +586,24 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                     BeanUtil.copyProperties(proWorkorder,taskProWorkorderPrintData);
                     value.put("header",taskProWorkorderPrintData);
                     value.put("detail",taskBatchTasks);
+                    if(taskProWorkorderPrintData.getExpectStartDate() != null || taskProWorkorderPrintData.getRequestDate() != null){
+                        for (ProTask proTask : taskBatchTasks){
+                            String begin = taskProWorkorderPrintData.getExpectStartDate() != null ? simpleDateFormat1.format(taskProWorkorderPrintData.getExpectStartDate()) : "空";
+                            String end = taskProWorkorderPrintData.getRequestDate() != null ? simpleDateFormat1.format(taskProWorkorderPrintData.getRequestDate()) : "空";
+                            proTask.setExpectStartDateString(begin);
+                            proTask.setRequestDateString(end);
+                        }
+                    }
                     taskProWorkorderPrintData.setSize(i++);
                     taskProWorkorderPrintData.setDate(simpleDateFormat.format(new Date()));
                     taskProWorkorderPrintData.setQuantity(taskBatchTasks.get(0).getQuantity());
-                    if(proWorkorder.getOrderCode() != null && proWorkorder.getProductId() != null){
-                        OdSalesOrderDetail odSalesOrderDetail =  odSalesOrderDetailMapper.getByOrderCodeAndproductId(proWorkorder.getOrderCode(),proWorkorder.getProductId());
-                        if(odSalesOrderDetail != null){
-                            taskProWorkorderPrintData.setClientItemNo(odSalesOrderDetail.getClientItemNo());
-                            taskProWorkorderPrintData.setPoOrderNo(odSalesOrderDetail.getPoOrderNo());
-                        }
-                    }
+//                    if(proWorkorder.getOrderCode() != null && proWorkorder.getProductId() != null){
+//                        OdSalesOrderDetail odSalesOrderDetail =  odSalesOrderDetailMapper.getByOrderCodeAndproductId(proWorkorder.getOrderCode(),proWorkorder.getProductId());
+//                        if(odSalesOrderDetail != null){
+//                            taskProWorkorderPrintData.setClientItemNo(odSalesOrderDetail.getClientItemNo());
+//                            taskProWorkorderPrintData.setPoOrderNo(odSalesOrderDetail.getPoOrderNo());
+//                        }
+//                    }
                 }
             }
             return printData;