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
zpl 4 years ago
parent 4751c67aa0 76804709d8
commit a6d4b86301
12 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
Unescape Escape View File

@ -194,6 +194,8 @@ public interface Constants {
//用户组
String USER_GROUP_ADMINISTRATOR = "ADMINISTRATORS";
//外协
String USER_GROUP_WX_USER = "WX_USER";
//车间调度
String USER_GROUP_CJDD = "CJDD";
//总计划

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

@ -68,7 +68,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
public static final String STATUS_FINISH = "FINISH";
public static final String STATUS_CANCEL = "CANCEL";
public static final String MESSAGE_TYPE_WLZB = "WLZB";
@Autowired
@Autowired(required = false)
@Qualifier("defaultJmsTemplate")
private JmsMessagingTemplate jmsTemplate;
@Value("${print.server}")
@ -486,7 +487,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
// 是否主观件 :辅料类型是9，则为主观件
String accessory_type = customFieldsMapper.selectCustomFieldsValue(selectCurrent.getHandle(), "ACCESSORY_TYPE");
if ("9".equals(accessory_type)){
if (StringUtil.notBlank(accessory_type)&&"9".equals(accessory_type)){
labelPrintDto.setMainPart(true);
}else{
labelPrintDto.setMainPart(false);

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

@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
public class ActiveMQUtil {
@Autowired
@Autowired(required = false)
@Qualifier("mesJmsTemplate")
private JmsMessagingTemplate mesJmsTemplate;

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

@ -688,6 +688,6 @@ public class DateUtil
int second = calendar.get(Calendar.SECOND);
int msec = calendar.get(Calendar.MILLISECOND);
return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second);
return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second) + String.valueOf(msec);
}
}

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

@ -8,7 +8,7 @@ spring:
driver-class-name: com.sap.db.jdbc.Driver
jndi-name: jdbc/jts/wipPool
activemq:
enabled: true
enabled: false
brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin

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

@ -38,7 +38,7 @@ spring:
merge-sql: true
slow-sql-millis: 100
activemq:
enabled: true
enabled: false
brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin

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

@ -8,7 +8,7 @@ spring:
driver-class-name: com.sap.db.jdbc.Driver
jndi-name: jdbc/jts/wipPool
activemq:
enabled: true
enabled: false
brokerUrl: tcp://172.16.251.133:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin

8
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
Unescape Escape View File

@ -212,14 +212,16 @@ public class SfcDispatchController {
result = sfcDispatchService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
@PostMapping("/gantt-list")
@GetMapping("/gantt-list")
public R ganttList(@RequestParam(required = false) Map paramMap) {
Map<String, Object> result = new HashMap<>();
try {
String site = CommonMethods.getSite();
paramMap.put("site", site);
paramMap.put("", DispatchStatusEnum.RELEASE.getCode());
paramMap.put("status", "('RELEASE','START','COMPLETE')");
result = sfcDispatchService.ganttList(site, paramMap);
@ -229,6 +231,4 @@ public class SfcDispatchController {
return R.ok(result);
}
}

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

@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -107,6 +108,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
if (Constants.USER_GROUP_ADMINISTRATOR.equals(userGroup)) {
role = Constants.USER_GROUP_ADMINISTRATOR;
break;
} else if (Constants.USER_GROUP_WX_USER.equals(userGroup)) {
role = Constants.USER_GROUP_WX_USER;
break;
} else if (Constants.USER_GROUP_CJDD.equals(userGroup)) {
role = Constants.USER_GROUP_CJDD;
break;
@ -300,8 +304,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
}
});
Date startFromDate = (Date) paramMap.get("startFromDate");
Date StartToDate = (Date) paramMap.get("StartToDate");
Date startFromDate = DateUtil.parseDate((String)paramMap.get("startFromDate"));
Date StartToDate = DateUtil.parseDate((String)paramMap.get("StartToDate"));
Map<String, Map<String, List<WorkCenterWorkTimeDTO>>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, startFromDate, StartToDate);
map.put("workCenterWorkTimes", processedMap);

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

@ -708,6 +708,9 @@
<if test="dispatchStatus != null and dispatchStatus != ''">
AND SD.DISPATCH_STATUS = #{dispatchStatus}
</if>
<if test="status != null and status != ''">
AND SD.DISPATCH_STATUS IN ${status}
</if>
<if test="item != null and item != ''">
AND IM.ITEM = #{item}
</if>

2
equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class ResourceMQConsume {
@Autowired
private ResourceMQProcess resourceMQProcess;
@Autowired
@Autowired(required = false)
@Qualifier("defaultJmsTemplate")
private JmsMessagingTemplate template;

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

@ -31,7 +31,6 @@ import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
import com.foreverwin.mesnac.production.mapper.SfcDataAssembleMapper;
import com.foreverwin.mesnac.production.model.LoadInventory;
import com.foreverwin.mesnac.production.model.SfcHoldLog;
import com.foreverwin.mesnac.production.model.WorkShopTransfer;
import com.foreverwin.mesnac.production.service.*;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.meext.MEServices;
@ -90,8 +89,6 @@ public class PodTemplateServiceImpl implements PodTemplateService {
private LoadInventoryService loadInventoryService;
@Autowired
private SfcHoldLogService sfcHoldLogService;
@Autowired
private WorkShopTransferService workShopTransferService;
@Override
public Map<String, Object> resrceEnter(WorkCenterDto workCenterDto) {
@ -208,9 +205,8 @@ public class PodTemplateServiceImpl implements PodTemplateService {
String dispatchNo = sfcDto.getDispatchNo();
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc));
BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT");
String isOutSource = transfer.getIsOutSource();
if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)){
if (!operation.equals("WX_6106GX")){
//是否有互检检验项目
List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_H);
if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {
@ -264,9 +260,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
}
BigDecimal workHour=BigDecimal.ZERO;
BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT");
String isOutSource = transfer.getIsOutSource();
if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)) {
if (!operation.equals("WX_6106GX")) {
//是否有自检检验项目
List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_Z);
if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {

Write Preview
Loading…
Cancel
Save