Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
赵嘉伟 4 years ago
parent 32eca67b0a c64dc352dd
commit 001bd1f274
8 changed files with 218 additions and 70 deletions
Show Stats Download Patch File Download Diff File

19
common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.modular.core.util.CommonMethods;
@ -53,6 +54,24 @@ public class ToolController {
return R.ok(result);
}
/**
* 查询所有数据，状态为Y的刀具
*
* @return
*/
@ResponseBody
@GetMapping("/getToolListByStatus")
public R getToolListByStatus(Tool tool){
String site = CommonMethods.getSite();
tool.setSite(site);
tool.setStatus(Constants.TOOL_STATUS_Y);
List<Tool> result;
QueryWrapper<Tool> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(tool);
result = toolService.list(queryWrapper);
return R.ok(result);
}
/**
* 分页查询数据
*

5
common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
Unescape Escape View File

@ -85,8 +85,9 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
if (byId==null){
throw new BaseException("未找到检验任务");
}
if(StringUtil.notBlank(byId.getResult())){
throw new BaseException("检验任务已经保存完成!");
String result= byId.getResult();
if(StringUtil.notBlank(result)&&result.equals(Constants.RSESULT_OK)){
throw new BaseException("检验任务已经保存合格!");
}
task.setComments((String) paramMap.get("COMMENTS"));
task.setStatus(Constants.INSPECTION_TASK_STATUS_COMPLETE);

187
common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
Unescape Escape View File

@ -22,6 +22,7 @@ import com.foreverwin.mesnac.common.service.PrintLogService;
import com.foreverwin.mesnac.common.service.ProdReadyTaskDetailService;
import com.foreverwin.mesnac.common.service.ProdReadyTaskService;
import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
import com.foreverwin.mesnac.common.util.DateUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.dto.BomComponentDto;
import com.foreverwin.mesnac.meapi.model.Item;
@ -33,18 +34,20 @@ import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.jms.core.JmsMessagingTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.jms.ConnectionFactory;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* <p>
@ -65,7 +68,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
public static final String STATUS_DOING = "DOING";
public static final String STATUS_FINISH = "FINISH";
public static final String STATUS_CANCEL = "CANCEL";
@Value("${spring.activemq.brokerUrl}")
String brokerURL;
@Value("${print.server}")
private String printServer;
@Autowired
@ -146,9 +150,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
String accessoryType = bomComponentDto.getAccessoryType();
//物料P001，校验当前派工单（SFC+工序/步骤）加工是否需要准备物料
if (accessoryType == null || accessoryType.equals("0")) {
if (prodReadyTaskDetailList.size()>0){
if (prodReadyTaskDetailList.size() > 0) {
long count = prodReadyTaskDetailList.stream().filter(prodReadyTaskDetail -> prodReadyTaskDetail.getInspectionItem().equals(P01)).count();
if (count>0){
if (count > 0) {
continue;
}
}
@ -164,9 +168,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now());
prodReadyTaskDetailList.add(prodReadyTaskDetail);
} else if (accessoryType.equals("1")) {
if (prodReadyTaskDetailList.size()>0){
if (prodReadyTaskDetailList.size() > 0) {
long count = prodReadyTaskDetailList.stream().filter(prodReadyTaskDetail -> prodReadyTaskDetail.getInspectionItem().equals(P02)).count();
if (count>0){
if (count > 0) {
continue;
}
}
@ -268,7 +272,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
public List<Map<String, Object>> getInspectionDetailList(Map<String, String> param) {
String type = param.get("type");
String dispatchNo = param.get("dispatchNo");
List<Map<String, Object>> returnMap = null;
List<Map<String, Object>> returnMap = new ArrayList<>();
String site = CommonMethods.getSite();
if (type.equals(P01)) {
//物料接收数据
@ -278,6 +282,18 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
returnMap = prodReadyTaskMapper.getToolDetail(site, LocaleContextHolder.getLocale().getLanguage(), dispatchNo);
} else {
//通过加工的零件号、设备类型、设备获取发布状态的工控程序
SfcDispatchDto sfcdispatch=new SfcDispatchDto();
sfcdispatch.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site,dispatchNo));
sfcdispatch = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatch);
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfcdispatch.getSfc()));
String itemBo = sfcServiceById.getItemBo();
JSONObject jsonObject = sendToDnc(StringUtil.trimHandle(itemBo), sfcdispatch.getResrce(), sfcdispatch.getResourceType());
Map<String, Object> map=new HashMap<>();
map.put("RESOURCE",sfcdispatch.getResrce());
map.put("RESOURCE_TYPE",sfcdispatch.getResourceType());
map.put("RESULT",jsonObject.get("RESULT"));
map.put("MESSAGE",jsonObject.get("MESSAGE"));
returnMap.add(map);
}
return returnMap;
}
@ -289,7 +305,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
if (byId.getStatus().equals(STATUS_CANCEL)) {
throw new BaseException("产前准备任务任务已取消");
}
if (byId.getStatus().equals(STATUS_FINISH)&&byId.getResult().equals(Constants.RSESULT_OK)) {
if (byId.getStatus().equals(STATUS_FINISH) && byId.getResult().equals(Constants.RSESULT_OK)) {
throw new BaseException("产前准备任务任务已完成");
}
List<ProdReadyTaskDetail> prodReadyTaskDetailList = prodReadyTask.getProdReadyTaskDetailList();
@ -314,70 +330,70 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
String site = CommonMethods.getSite();
String user = CommonMethods.getUser();
String sfcDispatchBo = prodReadyTask.getSfcDispatchBo();
SfcDispatchDto sfcDispatchDto=new SfcDispatchDto();
SfcDispatchDto sfcDispatchDto = new SfcDispatchDto();
sfcDispatchDto.setHandle(sfcDispatchBo);
sfcDispatchDto = sfcDispatchCommonService.findSfcDispatchBySfc(sfcDispatchDto);
List<PrintLog> printList=new ArrayList<>();
List<PrintLog> printList = new ArrayList<>();
List<LabelPrintDto> labelPrintDtoList = new ArrayList<>();
String printData = null;
PrintLog printTag=new PrintLog();
PrintLog printTag = new PrintLog();
String resrce = sfcDispatchDto.getResrce();
String printName = customFieldsService.getCustomFieldsValue(HandleEnum.RESOURCE.getHandle(site, resrce), CustomFieldConstant.RESRCE_CUSTOM_FIELD_PRINT_NAME);
if (StringUtil.isBlank(printName)){
if (StringUtil.isBlank(printName)) {
throw new BaseException("资源维护的打印机不能为空");
}
String item = prodReadyTask.getItem();
Item selectCurrent = itemService.selectCurrent(site, item);
QueryWrapper<PrintLog> queryWrapper=new QueryWrapper();
queryWrapper.eq(PrintLog.SFC,prodReadyTask.getSfc());
queryWrapper.eq(PrintLog.STEP_ID,prodReadyTask.getStepId());
queryWrapper.eq(PrintLog.RESRCE,prodReadyTask.getResrce());
queryWrapper.eq(PrintLog.CATEGORY,Constants.PRINT_TYPE_SFC);
queryWrapper.eq(PrintLog.CATEGORY,Constants.PRINT_TYPE_SFC);
QueryWrapper<PrintLog> queryWrapper = new QueryWrapper();
queryWrapper.eq(PrintLog.SFC, prodReadyTask.getSfc());
queryWrapper.eq(PrintLog.STEP_ID, prodReadyTask.getStepId());
queryWrapper.eq(PrintLog.RESRCE, prodReadyTask.getResrce());
queryWrapper.eq(PrintLog.CATEGORY, Constants.PRINT_TYPE_SFC);
queryWrapper.eq(PrintLog.CATEGORY, Constants.PRINT_TYPE_SFC);
List<PrintLog> printLogList = printLogService.list(queryWrapper);
if (printLogList.isEmpty()){
//打印参数
LabelPrintDto labelPrintDto = new LabelPrintDto();
labelPrintDto.setPrinter(printName);
labelPrintDto.setPrintTemplate(Constants.PRINT_TYPE_SFC);
labelPrintDto.setItem(sfcDispatchDto.getItem());
labelPrintDto.setItemDescription(selectCurrent.getDescription());
labelPrintDto.setSfc(prodReadyTask.getSfc());
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));
String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DRAWING_REVISION);
labelPrintDto.setDrawingVersion(drawingRevision);
labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), "WORK_ORDER");
labelPrintDto.setWorkOrder(workOrder);
labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
labelPrintDto.setOperation(sfcDispatchDto.getOperation());
labelPrintDtoList.add(labelPrintDto);
printData = JSON.toJSONString(labelPrintDtoList);
//打印记录
printTag.setHandle(UUID.randomUUID().toString());
printTag.setPrintName(printName);
printTag.setPrintTemplate(Constants.PRINT_TYPE_SFC);
printTag.setSite(site);
printTag.setCategory(Constants.PRINT_TYPE_SFC);
printTag.setPrintParam(JSON.toJSONString(labelPrintDtoList));
printTag.setSfc(prodReadyTask.getSfc());
printTag.setResrce(prodReadyTask.getResrce());
printTag.setStepId(prodReadyTask.getStepId());
printTag.setOperation(prodReadyTask.getOperation());
printTag.setItemBo(selectCurrent.getHandle());
printTag.setIsPrint("false");
printTag.setPrintNum(0);
printTag.setItem(item);
printTag.setItemDescription(selectCurrent.getDescription());
if (printLogList.isEmpty()) {
//打印参数
LabelPrintDto labelPrintDto = new LabelPrintDto();
labelPrintDto.setPrinter(printName);
labelPrintDto.setPrintTemplate(Constants.PRINT_TYPE_SFC);
labelPrintDto.setItem(sfcDispatchDto.getItem());
labelPrintDto.setItemDescription(selectCurrent.getDescription());
labelPrintDto.setSfc(prodReadyTask.getSfc());
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));
String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DRAWING_REVISION);
labelPrintDto.setDrawingVersion(drawingRevision);
labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), "WORK_ORDER");
labelPrintDto.setWorkOrder(workOrder);
labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
labelPrintDto.setOperation(sfcDispatchDto.getOperation());
labelPrintDtoList.add(labelPrintDto);
printData = JSON.toJSONString(labelPrintDtoList);
//打印记录
printTag.setHandle(UUID.randomUUID().toString());
printTag.setPrintName(printName);
printTag.setPrintTemplate(Constants.PRINT_TYPE_SFC);
printTag.setSite(site);
printTag.setCategory(Constants.PRINT_TYPE_SFC);
printTag.setPrintParam(JSON.toJSONString(labelPrintDtoList));
printTag.setSfc(prodReadyTask.getSfc());
printTag.setResrce(prodReadyTask.getResrce());
printTag.setStepId(prodReadyTask.getStepId());
printTag.setOperation(prodReadyTask.getOperation());
printTag.setItemBo(selectCurrent.getHandle());
printTag.setIsPrint("false");
printTag.setPrintNum(0);
printTag.setItem(item);
printTag.setItemDescription(selectCurrent.getDescription());
printList.add(printTag);
printLogService.savePrintLog(site,user,printTag);
printList.add(printTag);
printLogService.savePrintLog(site, user, printTag);
}else {
} else {
printData = printLogList.get(0).getPrintParam();
}
String post = HttpUtil.post(printServer,printData , 30000);
String post = HttpUtil.post(printServer, printData, 30000);
/**
* {"msg":"打印成功","code":0}
* {"msg":"打印失败","code":500}
@ -385,20 +401,20 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
*/
JSONObject jsonObject = JSONObject.parseObject(post);
String code = jsonObject.getString("code");
if (code == null){
if (code == null) {
}
if (post.indexOf("500") != -1){
if (post.indexOf("500") != -1) {
throw BusinessException.build("打印失败！");
}
if (printLogList.isEmpty()){
if (printLogList.isEmpty()) {
printTag.setIsPrint("true");
printTag.setPrintNum(1);
printLogService.updateById(printTag);
}else {
} else {
PrintLog printLog = printLogList.get(0);
printTag.setIsPrint("true");
printTag.setPrintNum(printLog.getPrintNum()+1);
printTag.setPrintNum(printLog.getPrintNum() + 1);
printTag.setModifiedDateTime(LocalDateTime.now());
printTag.setModifyUser(user);
printLogService.updateById(printLog);
@ -406,4 +422,47 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
}
public JSONObject sendToDnc(String item, String resource, String resourceType) {
String site = CommonMethods.getSite();
String queue="resource.check.process";
JSONObject messageObject=new JSONObject();
String tranid = UUID.randomUUID().toString();
messageObject.put("TRANID", tranid);
String dateTime = DateUtil.formatDate(new Date());
messageObject.put("DATE_TIME", dateTime);
messageObject.put("SITE", site);
messageObject.put("MESSAGE_ID", queue);
messageObject.put("ITEM", item);
messageObject.put("RESOURCE", resource);
messageObject.put("RESOURCE_TYPE", resourceType);
String causeMessage = null;
ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
ActiveMQConnection.DEFAULT_USER,
ActiveMQConnection.DEFAULT_PASSWORD, brokerURL);
JmsMessagingTemplate jmsMessagingTemplate = new JmsMessagingTemplate(connectionFactory);
jmsMessagingTemplate.getJmsTemplate().setReceiveTimeout(TimeUnit.SECONDS.toMillis(30));
String message = jmsMessagingTemplate.convertSendAndReceive(queue, messageObject.toString(), String.class);
if (StringUtil.isBlank(message)) {
causeMessage = "队列消息消费超时或者未返回消费数据";
} else {
JSONObject jsonNode = JSONObject.parseObject(message);
String result = jsonNode.getString("STATUS");
if ("S".equalsIgnoreCase(result)) {
return jsonNode;
} else {
causeMessage = jsonNode.getString("MESSAGE");
}
}
JSONObject messageFailObject = new JSONObject();
messageFailObject.put("TRANID", tranid);
messageFailObject.put("RESULT", "E");
messageFailObject.put("MESSAGE", causeMessage);
return messageFailObject;
}
}

17
equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java
Unescape Escape View File

@ -219,5 +219,22 @@ public class ResourceInspectTaskController {
return R.ok();
}
/**
* 扫码设备编号，获取当天的点检任务
* @param resourceInspectTaskDto
* @return
*/
@ResponseBody
@GetMapping("/getInspectTaskByResource")
public R getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto){
try {
return R.ok(resourceInspectTaskService.getInspectTaskByResource(resourceInspectTaskDto));
}catch (Exception e){
return R.failed("数据更新失败" + e.getMessage());
}
}
}

25
equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java
Unescape Escape View File

@ -152,15 +152,34 @@ public class ResourceInspectTask extends Model<ResourceInspectTask> {
*/
@TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime;
/**
* 检验项目清单
*/
@TableField(exist = false)
private List<ResourceInspectTaskParam> taskItemDetailList;
/**
* 耗用备品清单
*/
@TableField(exist = false)
private List<ResourceInspectTaskSpare> spareList;
/**
* 设备handle
*/
@TableField(exist = false)
private String ResourceBo;
/**
* 设备描述
*/
@TableField(exist = false)
private String resourceDescription;
public String getResourceDescription() {
return resourceDescription;
}
public void setResourceDescription(String resourceDescription) {
this.resourceDescription = resourceDescription;
}
public String getResourceBo() {
return ResourceBo;

8
equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java
Unescape Escape View File

@ -55,4 +55,12 @@ public interface ResourceInspectTaskService extends IService<ResourceInspectTask
void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto);
/**
* 扫码设备编号，获取当天的点检任务
* @param resourceInspectTaskDto
* @return
*/
ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto);
}

26
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
Unescape Escape View File

@ -178,7 +178,7 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
String site = CommonMethods.getSite();
String taskNo = resourceInspectTaskDto.getTaskNo();
String taskHandle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site, taskNo);
String executor = resourceInspectTaskDto.getExecutor();
String executor = CommonMethods.getUser();
String status = resourceInspectTaskDto.getStatus();
// 检验项、备品清单
List<ResourceInspectTaskParam> taskItemDetailList = resourceInspectTaskDto.getTaskItemDetailList();
@ -223,6 +223,30 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
resourceInspectTaskSpareService.saveBatch(taskSpareList);
}
@Override
public ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto) {
resourceInspectTaskDto.setSite(CommonMethods.getSite());
LocalDateTime now = LocalDateTime.now();
LocalDateTime compareStart = now.minusHours(now.getHour()).minusMinutes(now.getMinute());
LocalDateTime compareEnd = compareStart.plusDays(1);
resourceInspectTaskDto.setCompareStartDate(compareStart.toString().substring(0,16).replace('T',' '));
resourceInspectTaskDto.setCompareEndDate(compareEnd.toString().substring(0,16).replace('T',' '));
// 获取当日任务的handle
List<ResourceInspectTaskDto> resourceInspectTaskList = resourceInspectTaskMapper.findResourceInspectTaskList(resourceInspectTaskDto);
if (resourceInspectTaskList.size() == 1){
ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
resourceInspectTask.setHandle(resourceInspectTaskList.get(0).getHandle());
ResourceInspectTask resourceInspectTaskAll = resourceInspectTaskService.getResourceInspectTaskAll(resourceInspectTask);
resourceInspectTaskAll.setResourceDescription(resourceInspectTaskList.get(0).getResourceDescription());
return resourceInspectTaskAll;
}
// 获取任务详情
if (resourceInspectTaskList.size() > 1){
throw BusinessException.build("当前设备当日点检任务不止一个！");
}
throw BusinessException.build("未找到当日的点检任务！");
}
/***
* 任务创建周期
*/

1
equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
Unescape Escape View File

@ -706,6 +706,7 @@
AND ZRIT.STATUS = #{status}
</select>
<!--条件查询，根据点检计划、设备查询处理中、新建的点检任务-->
<select id="getInspectTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
WHERE ZRIT.SITE = #{site}

Write Preview
Loading…
Cancel
Save