更新打印

mes/src/main/java/com/ximai/mes/md/mapper/MdFactoryMapper.java

@@ -61,4 +61,6 @@ public interface MdFactoryMapper
     public int deleteMdFactoryByFactoryIds(Long[] factoryIds);
 
     MdFactory selectMdFactoryByFactoryCode(@Param("factoryCode") String factoryCode);
+
+    List<MdFactory> selectLikeByName(@Param("factoryName")String factoryName);
 }

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

@@ -16,4 +16,5 @@ public class TaskProWorkorderPrintData extends ProWorkorder {
 
     private String clientItemNo;
 
+    private String taskBatch;
 }

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

@@ -12,6 +12,8 @@ import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.aspect.MethodExtendedProcess;
 import com.ximai.mes.aspect.MethodExtendedProcesses;
 import com.ximai.mes.constant.*;
+import com.ximai.mes.md.domain.MdFactory;
+import com.ximai.mes.md.mapper.MdFactoryMapper;
 import com.ximai.mes.md.mapper.MdWorkunitMapper;
 import com.ximai.mes.md.service.IMdWorkunitService;
 import com.ximai.mes.od.domain.OdSalesOrderDetail;
@@ -104,7 +106,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
     private MdWorkunitMapper mdWorkunitMapper;
     @Autowired
     private IProAllocationMaterialService proAllocationMaterialService;
-
+    @Autowired
+    private MdFactoryMapper mdFactoryMapper;
     @Autowired
     private OdSalesOrderDetailMapper odSalesOrderDetailMapper;
     @Override
@@ -581,24 +584,27 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
             Map<String, Object> printData = new HashMap<>();
             ArrayList valueList = new ArrayList();
             printData.put("reportName","process.xml");
+            List<MdFactory> mdFactorys = mdFactoryMapper.selectLikeByName("上海希迈机电");
+            if(mdFactorys.size() > 0){
+                printData.put("reportName","process-cn.xml");
+            }
             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");
             SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
             for (String taskBatch : taskBatchs){
                 List<ProTask> taskBatchTasks = proTaskMapper.selectByTaskBatch(taskBatch);
-
+                String[] sp = taskBatch.split("-");
                 if(taskBatchTasks.size() > 0){
                     List<TaskProPrintData> taskProPrintDatas = new ArrayList<>();
-
                     Map<String,Object> value = new HashMap<>();
-                    valueList.add( value);
+                    valueList.add(value);
                     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()));
+                    taskProWorkorderPrintData.setTaskBatch(sp[sp.length-1]);
                     value.put("header",taskProWorkorderPrintData);
                     value.put("detail",taskProPrintDatas);
                     Date over = null;

mes/src/main/resources/mapper/md/MdFactoryMapper.xml

@@ -49,6 +49,9 @@
         <include refid="selectMdFactoryVo"/>
         where factory_code = #{factoryCode}
     </select>
+    <select id="selectLikeByName" resultType="com.ximai.mes.md.domain.MdFactory">
+        select * from md_factory where factory_name like '%${factoryName}%'
+    </select>
 
     <insert id="insertMdFactory" parameterType="MdFactory" useGeneratedKeys="true" keyProperty="factoryId">
         insert into md_factory