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 89587b6ab1 2885e049b2
commit b4aecf5dcd
9 changed files with 37 additions and 24 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);

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);
/**
* 查询派工单

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

@ -180,7 +180,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
}else {
String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
Date date = new Date(System.currentTimeMillis());
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String taskNo = "";
String itemNumber = (String) paramMap.get("ITEM_NUMBER");
String description = "";
@ -275,7 +275,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
Date date = new Date(System.currentTimeMillis());
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String taskNo = "";
if (StringUtil.isBlank(itemNumber)) {
taskNo = "P_" + dateFormat1.format(date);

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;

Write Preview
Loading…
Cancel
Save