Merge remote-tracking branch 'origin/master'

master
赵嘉伟 3 years ago
commit 974fa0800d

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

@ -82,7 +82,6 @@ public class ReportDataController {
@GetMapping("/findProductStateInfo")
public R findProductStateInfo(@RequestParam(required = false) Map paramMap) {
try {
paramMap.put("site", CommonMethods.getSite());
List<Map<String, Object>> result = reportDataService.findProductStateInfo(paramMap);
return R.ok(result);
} catch (Exception e) {

@ -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,6 +2,7 @@ package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.mesnac.common.mapper.ReportDataMapper;
import com.foreverwin.mesnac.common.service.ReportDataService;
import com.foreverwin.modular.core.util.CommonMethods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -33,6 +34,7 @@ public class ReportDataServiceImpl implements ReportDataService{
@Override
public List<Map<String, Object>> findProductStateInfo(Map paramMap) {
paramMap.put("site", CommonMethods.getSite());
return reportDataMapper.findProductStateInfo(paramMap);
}
}

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

@ -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);
}
}

@ -42,10 +42,10 @@
AND ZT.RESULT = #{result}
</if>
<if test="startFromDate != null and startFromDate != ''" >
AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24
</if>
<if test="startToDate != null and startToDate != ''" >
AND ZT.MODIFIED_DATE_TIME &lt;= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
AND ZT.MODIFIED_DATE_TIME &lt;= TO_DATE(#{startToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if>
</select>
@ -61,6 +61,67 @@
<!--每日生产状态报表-->
<select id="findProductStateInfo" resultType="java.util.HashMap" parameterType="java.util.HashMap" >
SELECT CFB.VALUE ITEM_NUMBER , ZSD.SHOP_ORDER , I.ITEM , IT.DESCRIPTION ITEM_DESCRIPTION , S.QTY PLAN_QTY ,CFA.VALUE WORK_ORDER ,
ZSD.SFC , ZSD.WORK_CENTER , WCT.DESCRIPTION WORK_CENTER_DESCRIPTION , RU.ROUTER_TYPE , ZSD.STEP_ID , ZSD.OPERATION ,
OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION , ZSD.DISPATCH_STATUS OPERATION_STATUS ,
ZSD.PROD_HOURS ,ZSD.ACTUAL_PROD_HOURS , ZSD.PLANNED_START_DATE , ZSD.PLANNED_COMP_DATE , ZSD.ACTUAL_START_DATE , ZSD.ACTUAL_COMPLETE_DATE
FROM Z_SFC_DISPATCH ZSD
LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER'
LEFT JOIN SFC S ON S.SFC = ZSD.SFC
LEFT JOIN ITEM I ON I.HANDLE = S.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO
LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER
LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE
LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE
LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE
LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
WHERE ZSD.SITE = #{site}
<!--<if test="itemNumber != null and itemNumber != ''" >
AND CFB.VALUE LIKE '%'||#{itemNumber}||'%'
</if>-->
<if test="workOrder != null and workOrder != ''" >
AND CFA.VALUE LIKE '%'||#{workOrder}||'%'
</if>
<if test="shopOrder != null and shopOrder != ''" >
AND ZSD.SHOP_ORDER = #{shopOrder}
</if>
<if test="workCenter != null and workCenter != ''" >
AND ZSD.WORK_CENTER = #{workCenter}
</if>
<if test="resrce != null and resrce != ''" >
AND ZSD.RESRCE = #{resrce}
</if>
<if test="routerType != null and routerType != ''" >
<if test="routerType = 'C'.toString()" >
AND RU.ROUTER_TYPE = #{routerType}
</if>
<if test="routerType != 'C'.toString()" >
AND RU.ROUTER_TYPE != #{routerType}
</if>
</if>
<if test="operationStatus != null and operationStatus != ''" >
<if test="operationStatus = 'OTHER'.toString()" >
AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE'
</if>
<if test="operationStatus != 'OTHER'.toString()" >
AND ZSD.DISPATCH_STATUS = #{operationStatus}
</if>
</if>
<if test="startFromDate != null and startFromDate != ''" >
AND ZSD.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24
</if>
<if test="startToDate != null and startToDate != ''" >
AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(#{startToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="actualStartFromDate != null and actualStartFromDate != ''" >
AND ZSD.ACTUAL_START_DATE >= TO_DATE(#{actualStartFromDate}, 'YYYY-MM-DD') - 8/24
</if>
<if test="actualStartToDate != null and actualStartToDate != ''" >
AND ZSD.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{actualStartToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if>
</select>

@ -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

@ -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

@ -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

@ -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);
}
}

@ -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);

@ -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>

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

@ -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) {

Loading…
Cancel
Save