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
philip 3 years ago
parent 18df19141e 9c78e2b98a
commit 72468db1e8
15 changed files with 77 additions and 30 deletions
Show Stats Download Patch File Download Diff File

8
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
Unescape Escape View File

@ -361,12 +361,12 @@ public class AbnormalBillController {
}
@GetMapping("/findResrceBySfc")
public R findResrceBySfc(SfcDispatchDto sfcDispatch){
@GetMapping("/findResrceAndWorkCenterBySfc")
public R findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch){
try{
return R.ok(sfcDispatchCommonService.findResrceBySfc(sfcDispatch));
return R.ok(sfcDispatchCommonService.findResrceAndWorkCenterBySfc(sfcDispatch));
}catch (Exception e){
return R.failed("根据sfc查找设备失败:"+e.getMessage());
return R.failed("根据sfc查找设备和工作中心失败:"+e.getMessage());
}
}

3
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
Unescape Escape View File

@ -10,7 +10,6 @@ import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing;
import com.foreverwin.mesnac.anomaly.service.ReportService;
import com.foreverwin.mesnac.integration.model.IntegrationLog;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -82,4 +81,6 @@ public class ReportController {
return R.failed(e.getMessage());
}
}
}

19
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.foreverwin.mesnac.anomaly.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing;
import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
import com.foreverwin.mesnac.anomaly.service.ReportService;
@ -61,6 +60,12 @@ public class ReportServiceImpl implements ReportService {
return reportMapper.partsManufacturing(site,locale,partsManufacturing);
}
/**
* 余料退回明细表
* @param item
* @param itemDescription
* @return
*/
@Override
public List<Map<String, Object>> surplusReturnTable(String item, String itemDescription) {
String locale = LocaleContextHolder.getLocale().getLanguage();
@ -68,13 +73,16 @@ public class ReportServiceImpl implements ReportService {
return reportMapper.surplusReturnTable(site,locale,item,itemDescription);
}
/**
* 资源维修报表
* @param map
* @return
*/
@Override
public List<Map<String, Object>> resourceRepair(Map<String, Object> map) {
String locale = LocaleContextHolder.getLocale().getLanguage();
String site = CommonMethods.getSite();
Map<String, List<NcCode>> ncCodeMap = new HashMap<>();
NcCode ncCode = new NcCode();
ncCode.setSite(site);
@ -132,6 +140,11 @@ public class ReportServiceImpl implements ReportService {
return maps;
}
/**
* 检验记录报表
* @param paramMap
* @return
*/
@Override
public List<Map<String, Object>> findInspectionTask(Map paramMap) {
return reportMapper.findInspectionTask(paramMap);

11
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -942,9 +942,18 @@
<if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo}
</if>
<if test="abnormalBill.status != null and abnormalBill.status != ''">
<if test="abnormalBill.status != null and abnormalBill.status != '' and abnormalBill.status != 'COMP'.toString()">
AND zab.STATUS = #{abnormalBill.status}
</if>
<if test="abnormalBill.status == 'J'.toString()">
AND zab.PROGRAM IS NULL
</if>
<if test="abnormalBill.status == 'F'.toString()">
AND zab.CORRECTION IS NULL
</if>
<if test="abnormalBill.status == 'COMP'.toString()">
AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G'
</if>
<if test="abnormalBill.startDateTime != null ">
AND zab.CREATED_DATE_TIME &gt;= #{abnormalBill.startDateTime}
</if>

10
common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
Unescape Escape View File

@ -49,6 +49,8 @@ public class LabelPrintDto implements Serializable {
private String operation;
//打印张数
private Integer printNum;
//是否主观件
private String mainPart;
public String getItemNumber() {
return itemNumber;
@ -201,4 +203,12 @@ public class LabelPrintDto implements Serializable {
public void setPrintNum(Integer printNum) {
this.printNum = printNum;
}
public String getMainPart() {
return mainPart;
}
public void setMainPart(String mainPart) {
this.mainPart = mainPart;
}
}

2
common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java
Unescape Escape View File

@ -43,7 +43,7 @@ public interface SfcDispatchCommonService {
* @param sfcDispatch
* @return
*/
SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch);
SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch);
/**
* 查询派工单

2
common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.util;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.jms.core.JmsMessagingTemplate;
import org.springframework.stereotype.Component;
@ -15,6 +16,7 @@ public class ActiveMQUtil {
@Autowired
@Qualifier("mesJmsTemplate")
private JmsMessagingTemplate mesJmsTemplate;
public void wechatSendMessage(String user, String text) {

17
console/src/main/resources/application-dev.yml
Unescape Escape View File

@ -8,14 +8,23 @@ spring:
driver-class-name: com.sap.db.jdbc.Driver
jndi-name: jdbc/jts/wipPool
activemq:
enabled: false
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
enabled: true
brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
enabled: true
max-connections: 10
#发送消息
activemq:
brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
enabled: true
max-connections: 10
#WebService
ws:
erp:
@ -40,9 +49,7 @@ print:
quartz:
enabled: true
activeMq:
sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
queue: send.weChat.notice
exportDocument:
filePath: /usr/word/
outputPath: /usr/word/outputWord/

2
console/src/main/resources/application-local.yml
Unescape Escape View File

@ -66,7 +66,7 @@ ws:
#quartz任务启用
quartz:
enabled: false
enabled: true
#打印服务器配置
print:

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
Unescape Escape View File

@ -53,7 +53,7 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
* @param site
* @return
*/
SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site);
SfcDispatchDto findResrceAndWorkCenterBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site);
SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch);

5
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
Unescape Escape View File

@ -691,10 +691,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
}
@Override
public SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch) {
public SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch) {
String site = CommonMethods.getSite();
String[] status = {"START","COMPLETE"};
return sfcDispatchMapper.findResrceBySfc(sfcDispatch,site);
return sfcDispatchMapper.findResrceAndWorkCenterBySfc(sfcDispatch,site);
}
@Override

6
dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
Unescape Escape View File

@ -794,15 +794,15 @@
WHERE SITE = #{site} AND DISPATCH_NO = #{dispatchNo}
</update>
<select id="findResrceBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
SELECT ZSD2.RESRCE FROM
<select id="findResrceAndWorkCenterBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
SELECT ZSD2.RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM
SFC S
INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE
INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE
INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
WHERE S.SITE = #{site}
AND ZSD2.RESRCE IS NOT NULL AND S.SFC = #{sfcDispatch.sfc}
AND S.SFC = #{sfcDispatch.sfc}
</select>
<select id="findSfcDispatchBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">

12
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
Unescape Escape View File

@ -1,18 +1,18 @@
package com.foreverwin.mesnac.meapi.service.impl;
import com.foreverwin.mesnac.meapi.dto.ShopOrderDto;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.meapi.model.ShopOrder;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.meapi.dto.ShopOrderDto;
import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
import com.foreverwin.mesnac.meapi.model.ShopOrder;
import com.foreverwin.mesnac.meapi.service.ShopOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.sap.me.status.StatusBOHandle;
import org.eclipse.jetty.util.StringUtil;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;

2
production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
Unescape Escape View File

@ -326,7 +326,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
//更改派工单状态
sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour);
//报工
sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
//sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
} catch (Exception e) {
ExceptionUtil.throwException(e);
}

6
quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java
Unescape Escape View File

@ -8,6 +8,8 @@ import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
@ -20,11 +22,15 @@ public class ResourceInspectTaskJob implements Job {
private static final String SITE_UPPERCASE = "SITE";
private static final String SITE_LOWERCASE = "site";
private Logger logger = LoggerFactory.getLogger("ResourceInspectTaskJob");
@Autowired
private ResourceInspectTaskJobService resourceInspectTaskJobService;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
logger.info("设备点检任务创建定时任务开始执行");
//获取站点，若站点为空则抛出异常
String site = getSite(context);
if (StringUtil.isBlank(site)) {

Write Preview
Loading…
Cancel
Save