forked from I3-YF/i3plus-mes-pcn-yfai
Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev
logic.fang
1 month ago
commit
a5fc0bbeef
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSn;
|
||||
|
||||
/**
|
||||
* @Description : 容器条码-业务方法
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/6/16 10:43
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesContainerSnService {
|
||||
|
||||
ListPager<MesContainerSn> queryMesContainerSnByPager(MesContainerSn mesContainerSn, Pager pager);
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnStation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 容器条码与站点关系表-业务方法
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/6/13 09:16
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesContainerSnStationService {
|
||||
|
||||
ListPager<MesContainerSnStation> queryPager(MesContainerSnStation mesContainerSnStation, Pager pager);
|
||||
|
||||
void doInsert(MesContainerSnStation mesContainerSnStation, String userName);
|
||||
|
||||
void doUpdate(MesContainerSnStation mesContainerSnStation, String userName);
|
||||
|
||||
void doUpdateIsValid(List<Long> idList, Integer status, String organizeCode, String userName);
|
||||
|
||||
void deleteWeaklyByIds(List<Long> idList, String organizeCode, String userName);
|
||||
|
||||
}
|
||||
@ -0,0 +1,123 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnStationService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnStation;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
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.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 容器条码与站点关系表
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/6/13 09:15
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "容器条码与站点关系表")
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mes-container-sn-station")
|
||||
public class MesContainerSnStationController {
|
||||
|
||||
@Autowired
|
||||
private IMesContainerSnStationService mesContainerSnStationService;
|
||||
|
||||
@GetMapping("/query")
|
||||
@ApiOperation(value = "查询")
|
||||
public ResultBean queryPager(MesContainerSnStation mesContainerSnStation, Pager pager) {
|
||||
try {
|
||||
ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空");
|
||||
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(
|
||||
mesContainerSnStationService.queryPager(mesContainerSnStation, pager));
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/insert")
|
||||
@ApiOperation(value = "新增")
|
||||
public ResultBean doInsert(@RequestBody MesContainerSnStation mesContainerSnStation) {
|
||||
try {
|
||||
String userName = AuthUtil.getSessionUser().getUserName();
|
||||
ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空");
|
||||
mesContainerSnStationService.doInsert(mesContainerSnStation, userName);
|
||||
return ResultBean.success("新增成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/update")
|
||||
@ApiOperation(value = "编辑")
|
||||
public ResultBean doUpdate(@RequestBody MesContainerSnStation mesContainerSnStation) {
|
||||
try {
|
||||
String userName = AuthUtil.getSessionUser().getUserName();
|
||||
ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空");
|
||||
mesContainerSnStationService.doUpdate(mesContainerSnStation, userName);
|
||||
return ResultBean.success("编辑成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update-isValid-by-id")
|
||||
@ApiOperation(value = "批量根据id启用或禁用")
|
||||
public ResultBean doUpdateIsValid(Long[] idList, Integer isValid, String organizeCode) {
|
||||
try {
|
||||
ValidatorBean.checkNotNull(organizeCode, "工厂代码为空");
|
||||
ValidatorBean.checkNotNull(idList, "请选择需要删除的信息");
|
||||
List<Long> ids = Arrays.asList(idList);
|
||||
if (isValid != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() &&
|
||||
isValid != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
|
||||
.setErrorDetail("状态值不符合要求，不允许操作").
|
||||
build();
|
||||
}
|
||||
String userName = AuthUtil.getSessionUser().getUserName();
|
||||
mesContainerSnStationService.doUpdateIsValid(ids, isValid, organizeCode, userName);
|
||||
return ResultBean.success("批量根据id启用或禁用成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping(value = "/delete-weakly")
|
||||
@ApiOperation(value = "批量软删除信息")
|
||||
public ResultBean batchDeleteWeaklyByIds(@RequestBody Long[] idList, String organizeCode) {
|
||||
try {
|
||||
ValidatorBean.checkNotNull(idList, "请选择需要删除的信息");
|
||||
ValidatorBean.checkNotNull(organizeCode, "工厂代码为空");
|
||||
List<Long> ids = Arrays.asList(idList);
|
||||
String userName = AuthUtil.getSessionUser().getUserName();
|
||||
mesContainerSnStationService.deleteWeaklyByIds(ids, organizeCode, userName);
|
||||
return ResultBean.success("批量删除信息成功")
|
||||
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnService;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSn;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesContainerSnRepository;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 容器条码-业务方法实现
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/6/16 10:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesContainerSnServiceImpl implements IMesContainerSnService {
|
||||
|
||||
@Autowired
|
||||
private MesContainerSnRepository mesContainerSnRepository;
|
||||
|
||||
@Override
|
||||
public ListPager<MesContainerSn> queryMesContainerSnByPager(MesContainerSn mesContainerSn, Pager pager) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesContainerSn.getOrganizeCode());
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSn.getContainerTypeCode(), "containerTypeCode", ddlPackBean);
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSn.getContainerSn(), "containerSn", ddlPackBean);
|
||||
pager = PagerHelper.getPager(pager, mesContainerSnRepository.findByHqlWhereCount(ddlPackBean));
|
||||
List<MesContainerSn> containerSnList = mesContainerSnRepository.findByHqlWherePage(ddlPackBean, pager);
|
||||
return new ListPager<>(containerSnList, pager);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,101 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnStation;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesContainerSnStationRepository;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnStationService;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @Description : 容器条码与站点关系表-业务方法实现
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/6/13 09:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesContainerSnStationServiceImpl implements IMesContainerSnStationService {
|
||||
|
||||
@Autowired
|
||||
private MesContainerSnStationRepository mesContainerSnStationRepository;
|
||||
|
||||
@Override
|
||||
public ListPager<MesContainerSnStation> queryPager(MesContainerSnStation mesContainerSnStation, Pager pager) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesContainerSnStation.getOrganizeCode());
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getEquipmentCode(), "equipmentCode", ddlPackBean);
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getStation(), "station", ddlPackBean);
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getContainerSn(), "containerSn", ddlPackBean);
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getPartNo(), "partNo", ddlPackBean);
|
||||
pager = PagerHelper.getPager(pager, mesContainerSnStationRepository.findByHqlWhereCount(ddlPackBean));
|
||||
List<MesContainerSnStation> containerSnStationList = mesContainerSnStationRepository.findByHqlWherePage(ddlPackBean, pager);
|
||||
return new ListPager<>(containerSnStationList, pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doInsert(MesContainerSnStation mesContainerSnStation, String userName) {
|
||||
//根据站点 + 设备代码的组合查询现有数据中最大的顺序号，新增数据的顺序号在最大值的基础上加一
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesContainerSnStation.getOrganizeCode());
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getEquipmentCode(), "equipmentCode", ddlPackBean);
|
||||
DdlPreparedPack.getStringEqualPack(mesContainerSnStation.getStation(), "station", ddlPackBean);
|
||||
DdlPreparedPack.getOrderByPack(
|
||||
new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
|
||||
new String[]{"seq"}, ddlPackBean);
|
||||
List<MesContainerSnStation> oldContainerSnStationList =
|
||||
mesContainerSnStationRepository.findByHqlTopWhere(ddlPackBean, 1);
|
||||
Integer seq;
|
||||
if (CollectionUtils.isEmpty(oldContainerSnStationList)) {
|
||||
seq = 1;
|
||||
}else {
|
||||
if (Objects.isNull(oldContainerSnStationList.get(0)) ||
|
||||
Objects.isNull(oldContainerSnStationList.get(0).getSeq())) {
|
||||
seq = 1;
|
||||
}else {
|
||||
seq = oldContainerSnStationList.get(0).getSeq() + 1;
|
||||
}
|
||||
}
|
||||
mesContainerSnStation.setSeq(seq);
|
||||
ConvertBean.saveOrUpdate(mesContainerSnStation, userName);
|
||||
mesContainerSnStationRepository.insert(mesContainerSnStation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doUpdate(MesContainerSnStation mesContainerSnStation, String userName) {
|
||||
ConvertBean.saveOrUpdate(mesContainerSnStation, userName);
|
||||
mesContainerSnStationRepository.update(mesContainerSnStation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doUpdateIsValid(List<Long> idList, Integer status, String organizeCode, String userName) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);
|
||||
mesContainerSnStationRepository.updateByProperties(
|
||||
new String[]{"modifyUser", "modifyDatetime", "isValid"},
|
||||
new Object[]{userName, TimeTool.getNowTime(true), status },
|
||||
ddlPackBean);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteWeaklyByIds(List<Long> idList, String organizeCode, String userName) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);
|
||||
mesContainerSnStationRepository.updateByProperties(
|
||||
new String[]{"modifyUser", "modifyDatetime", "isDeleted"},
|
||||
new Object[]{userName, TimeTool.getNowTime(true), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()},
|
||||
ddlPackBean);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue