更新打印

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

@@ -318,7 +318,8 @@ public class ProTask extends BaseEntity {
     private String idx;
     @ApiModelProperty("超报标识")
     private Boolean surpassState;
-
+    @TableField(exist = false)
+    private String processRemark;
     public String getStatusName() {
         return TaskStatusEnum.getStatusCn(this.getStatus());
     }

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

@@ -43,6 +43,7 @@ import com.ximai.mes.tm.mapper.TmToolMapper;
 import com.ximai.mes.tm.mapper.TmToolRequestUseItemMapper;
 import com.ximai.mes.tm.service.ITmToolRequestService;
 import com.ximai.system.mapper.SysUserMapper;
+import com.ximai.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -75,7 +76,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
     private IProTaskWorkunitService proTaskWorkunitService;
     @Resource
     private ProWorkorderMapper proWorkorderMapper;
-
+    @Autowired
+    private ISysDictDataService dictDataService;
     @Resource
     private SysUserMapper sysUserMapper;
     @Autowired
@@ -596,6 +598,7 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                     ProWorkorder proWorkorder = proWorkorderMapper.selectProWorkorderWorderCode(taskBatchTasks.get(0).getArrangeCode());
                     TaskProWorkorderPrintData taskProWorkorderPrintData = new TaskProWorkorderPrintData();
                     BeanUtil.copyProperties(proWorkorder,taskProWorkorderPrintData);
+                    taskProWorkorderPrintData.setWorkorderType(dictDataService.getDictLabel("mes_workorder_type", taskProWorkorderPrintData.getWorkorderType()));
                     value.put("header",taskProWorkorderPrintData);
                     value.put("detail",taskProPrintDatas);
                     if(taskProWorkorderPrintData.getExpectStartDate() != null || taskProWorkorderPrintData.getRequestDate() != null){
@@ -607,6 +610,7 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                             taskProPrintData.setExpectStartDateString(begin);
                             taskProPrintData.setRequestDateString(end);
                             taskProPrintDatas.add(taskProPrintData);
+
                         }
                     }
                     taskProWorkorderPrintData.setSize(i++);

mes/src/main/resources/mapper/pro/task/ProTaskMapper.xml

@@ -171,6 +171,7 @@
                t.arrange_code,
                p.process_code,
                p.process_name,
+               p.remark as processRemark,
                t.item_id,
                i.item_code,
                i.item_name,