forked from I3-YF/i3plus-mes-yfai
jun
1 year ago
parent
4326bbe286
commit
f605d49d1d
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2024/6/28 9:20
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesProduceSnService extends IBaseMesService<MesProduceSn> {
|
||||
|
||||
@ApiOperation(value = "根据条码查询产品条码表")
|
||||
List<MesProduceSn> findMesProduceSn(String organizeCode, String sn);
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 设备加工记录表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2024/6/28 9:20
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesProductionRecordService extends IBaseMesService<MesProductionRecord> {
|
||||
|
||||
@ApiOperation(value = "根据条码查询设备加工记录表")
|
||||
List<MesProductionRecord> findMesProductionRecord(String organizeCode, String sn);
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesYfReportService;
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import cn.estsh.impp.framework.base.controller.MesBaseController;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description : Mes业务报表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2024/6/28 14:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Api("Mes业务报表")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/report")
|
||||
public class MesBusiReportController extends MesBaseController {
|
||||
|
||||
@Autowired
|
||||
private IMesYfReportService mesYfReportService;
|
||||
|
||||
@ApiOperation(value = "查询追溯报表", notes = "查询追溯报表")
|
||||
@GetMapping("/traceability/find")
|
||||
public ResultBean findTraceabilityReport(MesProduceSn mesProduceSn) {
|
||||
try {
|
||||
ValidatorBean.beginValid(mesProduceSn).notNull("productSn", mesProduceSn.getProductSn());
|
||||
mesProduceSn.setOrganizeCode(AuthUtilExt.getOrganizeCode());
|
||||
return ResultBean.success("查询成功").setResultList(mesYfReportService.findTraceabilityReport(mesProduceSn));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.IMesProduceSnService;
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2024/6/28 9:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesProduceSnServiceImpl extends BaseMesService<MesProduceSn> implements IMesProduceSnService {
|
||||
|
||||
@Override
|
||||
public List<MesProduceSn> findMesProduceSn(String organizeCode, String sn) {
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getStringEqualPack(sn, "productSn", packBean);
|
||||
List<MesProduceSn> produceSnList = baseRDao.findByHqlWhere(packBean);
|
||||
if (CollectionUtils.isEmpty(produceSnList)) {
|
||||
MesException.throwMesBusiException("条码【%s】信息不存在", sn);
|
||||
}
|
||||
return produceSnList;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordService;
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 设备加工记录表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2024/6/28 9:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesProductionRecordServiceImpl extends BaseMesService<MesProductionRecord> implements IMesProductionRecordService {
|
||||
|
||||
@Override
|
||||
public List<MesProductionRecord> findMesProductionRecord(String organizeCode, String sn) {
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getStringEqualPack(sn, "productSn", packBean);
|
||||
DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),packBean);
|
||||
List<MesProductionRecord> produceSnList = baseRDao.findByHqlWhere(packBean);
|
||||
if (CollectionUtils.isEmpty(produceSnList)) {
|
||||
MesException.throwMesBusiException("条码【%s】加工记录信息不存在", sn);
|
||||
}
|
||||
return produceSnList;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue