diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index e06b5574..eb1d3a53 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -185,7 +185,7 @@ AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - AND ZT.MODIFIED_DATE_TIME <= TO_DATE(#{startToDate}|| '23:55:59', 'YYYY-MM-DD HH24:MI:SS') + AND ZT.MODIFIED_DATE_TIME <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java index 67bddb6c..541629ed 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java @@ -153,18 +153,18 @@ public class PrintLogServiceImpl extends ServiceImpl i } public void printServer(List list){ - /*String post = HttpUtil.post(printServer, JSON.toJSONString(list), 60000); - *//** + String post = HttpUtil.post(printServer, JSON.toJSONString(list), 60000); + /** * {"msg":"打印成功","code":0} * {"msg":"打印失败","code":500} * 根据返回值，更新打印机信息-printName及打印是否成功信息isPrint - *//* + */ JSONObject jsonObject = JSONObject.parseObject(post); Integer code = jsonObject.getInteger("code"); String msg = jsonObject.getString("msg"); if (code != 0){ throw BusinessException.build(msg); - }*/ + } } diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml index 36883dd6..b5ced4da 100644 --- a/console/src/main/resources/application-qas.yml +++ b/console/src/main/resources/application-qas.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: false + enabled: true brokerUrl: tcp://172.16.251.133:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin @@ -34,11 +34,12 @@ ws: pwd: a123456 valid: N +#ftp ftp: - host: + host: 172.16.251.165 port: 21 - username: - password: + username: mesftp + password: mesnac1@3 #打印服务器配置 print: diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index b6b29593..08615a77 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -43,101 +43,20 @@ public class SfcDispatchController { @Autowired public SfcDispatchService sfcDispatchService; - - /** - * 派工生产批次清单导出 - * - * @param workCenter - * @param dispatchStatus - * @param item - * @param workOrder - * @param shopOrder - * @param resrce - * @param resourceType - * @param operation - * @param sfc - * @param componentDescription - * @param turnOperation - * @param isDispatch - * @param startFromDate_S - * @param startToDate_S - * @param completeFromDate_S - * @param completeToDate_S - * @return - */ - @ResponseBody - @GetMapping("getSfcDispatch") - public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder, String blankingSize, - String resrce, String resourceType, String operation, String operationDescription, String sfc, String component, String componentDescription, String turnOperation, - String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) { - List list; - try { - SfcDispatchDto sfcDispatchDto = new SfcDispatchDto(); - sfcDispatchDto.setSite(CommonMethods.getSite()); - sfcDispatchDto.setUser(CommonMethods.getUser()); - sfcDispatchDto.setWorkCenter(workCenter); - sfcDispatchDto.setDispatchStatus(dispatchStatus); - sfcDispatchDto.setItem(item); - sfcDispatchDto.setItemNumber(itemNumber); - sfcDispatchDto.setWorkOrder(workOrder); - sfcDispatchDto.setShopOrder(shopOrder); - sfcDispatchDto.setResrce(resrce); - sfcDispatchDto.setResourceType(resourceType); - sfcDispatchDto.setOperation(operation); - sfcDispatchDto.setSfc(sfc); - sfcDispatchDto.setBlankingSize(blankingSize); - sfcDispatchDto.setComponent(component); - sfcDispatchDto.setComponentDescription(componentDescription); - sfcDispatchDto.setTurnOperation(turnOperation); - sfcDispatchDto.setIsDispatch(isDispatch); - if (startFromDate_S != null) { - sfcDispatchDto.setStartFromDate(DateUtil.parse(startFromDate_S)); - } - if (startToDate_S != null) { - sfcDispatchDto.setStartToDate(DateUtil.parse(startToDate_S)); - } - if (completeFromDate_S != null) { - sfcDispatchDto.setCompleteFromDate(DateUtil.parse(completeFromDate_S)); - } - if (completeToDate_S != null) { - sfcDispatchDto.setCompleteToDate(DateUtil.parse(completeToDate_S)); - } - - list = sfcDispatchService.findSfcDispatchList(sfcDispatchDto); - } catch (Exception e) { - return R.failed(e.getMessage()); - } - - return R.ok(list); - } - /** * 查询派工数据 * - * @param sfcDispatchDto + * @param paramMap * @return */ @ResponseBody - @PostMapping("findSfcDispatch") - public R findSfcDispatch(@RequestBody SfcDispatchDto sfcDispatchDto) { + @GetMapping("findSfcDispatch") + public R findSfcDispatch(@RequestParam(required = false) Map paramMap) { List list; try { - sfcDispatchDto.setSite(CommonMethods.getSite()); - sfcDispatchDto.setUser(CommonMethods.getUser()); - if (sfcDispatchDto.getStartFromDate_S() != null) { - sfcDispatchDto.setStartFromDate(DateUtil.parse(sfcDispatchDto.getStartFromDate_S())); - } - if (sfcDispatchDto.getStartToDate_S() != null) { - sfcDispatchDto.setStartToDate(DateUtil.parse(sfcDispatchDto.getStartToDate_S())); - } - if (sfcDispatchDto.getCompleteFromDate_S() != null) { - sfcDispatchDto.setCompleteFromDate(DateUtil.parse(sfcDispatchDto.getCompleteFromDate_S())); - } - if (sfcDispatchDto.getCompleteToDate_S() != null) { - sfcDispatchDto.setCompleteToDate(DateUtil.parse(sfcDispatchDto.getCompleteToDate_S())); - } - - list = sfcDispatchService.findSfcDispatchList(sfcDispatchDto); + paramMap.put("site", CommonMethods.getSite()); + + list = sfcDispatchService.findSfcDispatchList(paramMap); } catch (Exception e) { return R.failed(e.getMessage()); } @@ -297,24 +216,16 @@ public class SfcDispatchController { return R.ok(result); } @PostMapping("/gantt-list") - public R ganttList(@RequestBody SfcDispatchDto sfcDispatchDto) { + public R ganttList(@RequestParam(required = false) Map paramMap) { Map result = new HashMap<>(); try { String site = CommonMethods.getSite(); - if (StringUtil.isBlank(sfcDispatchDto.getStartFromDate_S())) { - throw BusinessException.build("派工开始时间不能为空！"); - } - if (StringUtil.isBlank(sfcDispatchDto.getStartToDate_S())) { - throw BusinessException.build("派工开始时间不能为空！"); - } - sfcDispatchDto.setSite(site); - sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode()); - sfcDispatchDto.setStartFromDate(DateUtil.parseDate(sfcDispatchDto.getStartFromDate_S())); - sfcDispatchDto.setStartToDate(DateUtil.parseDate(sfcDispatchDto.getStartToDate_S())); - - - result = sfcDispatchService.ganttList(site, sfcDispatchDto); + paramMap.put("site", site); + paramMap.put("", DispatchStatusEnum.RELEASE.getCode()); + + + result = sfcDispatchService.ganttList(site, paramMap); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index d755ce71..fe88aa95 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; /** *

@@ -25,10 +26,10 @@ public interface SfcDispatchMapper extends BaseMapper { /** * 查询派工生产批次数据 * - * @param sfcDispatchDto + * @param paramMap * @return */ - List findSfcDispatchList(SfcDispatchDto sfcDispatchDto); + List findSfcDispatchList(Map paramMap); /** * 修改派工单状态 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java index e6ddae8b..9d8fee61 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java @@ -33,10 +33,10 @@ public interface SfcDispatchService extends IService { /** * 查询派工清单 * - * @param sfcDispatchDto + * @param paramMap * @return */ - List findSfcDispatchList(SfcDispatchDto sfcDispatchDto); + List findSfcDispatchList(Map paramMap); /** * 派工保存 @@ -105,10 +105,10 @@ public interface SfcDispatchService extends IService { * 甘特图数据查询 * * @param site - * @param sfcDispatchDto + * @param paramMap * @return */ - Map ganttList(String site, SfcDispatchDto sfcDispatchDto); + Map ganttList(String site, Map paramMap); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index b786ea0d..c2066bb3 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -88,8 +88,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl findSfcDispatchList(SfcDispatchDto sfcDispatchDto) { - List list = sfcDispatchMapper.findSfcDispatchList(sfcDispatchDto); + public List findSfcDispatchList(Map paramMap) { + List list = sfcDispatchMapper.findSfcDispatchList(paramMap); if (list == null || list.size() <= 0) { return list; } @@ -282,11 +282,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl ganttList(String site, SfcDispatchDto sfcDispatchDto) { + public Map ganttList(String site, Map paramMap) { Map map = new HashMap<>(); //查询派工数据 - List scheduleList = this.findSfcDispatchList(sfcDispatchDto); + List scheduleList = this.findSfcDispatchList(paramMap); if (scheduleList == null || scheduleList.size() <= 0) { return map; } @@ -299,7 +299,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, sfcDispatchDto.getStartFromDate(), sfcDispatchDto.getStartToDate()); + Date startFromDate = (Date) paramMap.get("startFromDate"); + Date StartToDate = (Date) paramMap.get("StartToDate"); + Map>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, startFromDate, StartToDate); map.put("workCenterWorkTimes", processedMap); return map; diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index cc2621cc..a3f83381 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -668,96 +668,102 @@ diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index 19ebf9ef..2f7e9a0f 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -212,6 +212,8 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ newInspectionTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW); newInspectionTask.setResult(null); newInspectionTask.setComments(null); + newInspectionTask.setCreatedDateTime(dateTime); + newInspectionTask.setModifiedDateTime(dateTime); inspectionTaskService.save(newInspectionTask); } } diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml index f0559043..68b442df 100644 --- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml +++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml @@ -39,14 +39,17 @@ AND B.WORK_CENTER = #{workCenter} - - - AND B.CATEGORY = #{category} - - - AND (B.CATEGORY = 'S' OR B.CATEGORY = 'P') - - + + + AND B.CATEGORY = #{category} + + + AND (B.CATEGORY = 'S' OR B.CATEGORY = 'P') + + + + AND B.TASK_NO =#{taskNo} + AND B.STATUS = #{status}