|
|
|
@ -523,12 +523,12 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
|
|
|
|
|
//根据车间找到对应车间的描述
|
|
|
|
|
WorkCenter workCenter = workCenterMapper.findWorkCenterDescriptionByWorkCenter(site, prodReadyTask.getWorkCenter(), locale);
|
|
|
|
|
//根据资源找到对应的产线的描述
|
|
|
|
|
Resrce byResrce = resrceService.findByResrce(prodReadyTask.getResrce());
|
|
|
|
|
Resrce byResrce = resrceService.getById(HandleEnum.RESOURCE.getHandle(site,prodReadyTask.getResrce()));
|
|
|
|
|
Item selectCurrent = itemService.selectCurrent(site, prodReadyTask.getItem());
|
|
|
|
|
//项目号
|
|
|
|
|
String item = selectCurrent.getItem() + "/" + selectCurrent.getDescription();
|
|
|
|
|
messageMap.put("WORKCENTER", workCenter.getDescription());
|
|
|
|
|
messageMap.put("RESOURCE", byResrce + "/" + byResrce.getDescription());
|
|
|
|
|
messageMap.put("RESOURCE", byResrce.getResrce() + "/" + byResrce.getDescription());
|
|
|
|
|
messageMap.put("ITEM", item);
|
|
|
|
|
messageMap.put("SHOPORDER", prodReadyTask.getShopOrder());
|
|
|
|
|
messageMap.put("SFC", prodReadyTask.getSfc());
|
|
|
|
|