From eb0af4bad36e50d72df33e9062b4bfa831c5efc7 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 9 Jun 2024 13:37:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=2041235=2041231=20412?= =?UTF-8?q?23=2041225=2041226=2041232=2041234?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesProduceGroupService.java | 14 ++++ .../controller/base/MesMediaFileCfgController.java | 74 ++++++++++++++++++++++ .../controller/base/MesProduceGroupController.java | 20 ++++++ .../base/MesCarSeriesLoosePartService.java | 2 + .../base/MesEquipmentVariableCfgService.java | 3 +- .../base/MesProduceGroupServiceImpl.java | 27 ++++++++ .../serviceimpl/base/MesWorkCellService.java | 10 +++ .../serviceimpl/base/MesWorkOrderService.java | 4 +- 8 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProduceGroupService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProduceGroupController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProduceGroupServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProduceGroupService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProduceGroupService.java new file mode 100644 index 0000000..c9c8375 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProduceGroupService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup; + +/** + * @Description :MES_生产组 + * @Reference : + * @Author : gsz + * @CreateDate 2024/6/9 13:30 + * @Modify: + **/ +public interface IMesProduceGroupService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 01005bc..a17ba42 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -5,19 +5,26 @@ import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg; import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository; 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 com.aliyun.oss.model.PutObjectRequest; +import com.aliyun.oss.model.PutObjectResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.jolokia.util.IoUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import org.testng.annotations.Optional; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; @@ -120,4 +127,71 @@ public class MesMediaFileCfgController extends BaseMesController52428800){ +// throw new BusinessException("单次上传不能超过200M"); +// } +// String objectKey = UUIDUtils.getRandomUUID()+file.getOriginalFilename(); +// PutObjectRequest request = new PutObjectRequest(bucketName, objectKey, file.getInputStream()); +// PutObjectResult putObjectResult= obsClient.putObject(request); +// objectUrl=objectKey; +// LOGGER.info("已上传对象的URL:{}", putObjectResult.getObjectUrl()); +// LOGGER.info("生成的文件访问名：{}", objectKey); +// } catch (ObsException e) { +// LOGGER.error("obs上传失败:{}", LogExceptionStackUtil.logExceptionStack(e)); +// return JsonResponse.error("obs上传失败"); +// } catch (Exception e) { +// LOGGER.error("上传失败文件为空或者超过200M:{}", LogExceptionStackUtil.logExceptionStack(e)); +// return JsonResponse.error("上传失败文件为空或者超过200M"); +// } finally { +// hweiOBSConfig.destroy(obsClient); +// } +// +// return JsonResponse.ok(objectUrl); +// } +// @GetMapping("/download") +// @ApiOperation("下载文件") +// public void download(@RequestParam("fileName") String fileName , HttpServletRequest request, HttpServletResponse response) { +// +// try (InputStream inputStream = hweiYunOBSService.fileDownload(fileName); +// BufferedOutputStream outputStream = new BufferedOutputStream(response.getOutputStream())){ +// +// // 为防止 文件名出现乱码 +// final String userAgent = request.getHeader("USER-AGENT"); +// // IE浏览器 +// if (StringUtils.contains(userAgent, "MSIE")) { +// fileName = URLEncoder.encode(fileName, "UTF-8"); +// } else { +// // google,火狐浏览器 +// if (StringUtils.contains(userAgent, "Mozilla")) { +// fileName = new String(fileName.getBytes(), "ISO8859-1"); +// } else { +// // 其他浏览器 +// fileName = URLEncoder.encode(fileName, "UTF-8"); +// } +// } +// response.setContentType("application/x-download"); +// // 设置让浏览器弹出下载提示框，而不是直接在浏览器中打开 +// response.addHeader("Content-Disposition", "attachment;filename=" + fileName); +// IoUtil.copy(inputStream, outputStream); +// } catch (Exception e) { +// LOGGER.error("文件下载失败{}", e.logExceptionStack(e)); +// } +// } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProduceGroupController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProduceGroupController.java new file mode 100644 index 0000000..dd4bb15 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProduceGroupController.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description :MES_生产组 + * @Reference : + * @Author : gsz + * @CreateDate 2024/6/9 13:30 + * @Modify: + **/ +@Api(description = "装车组") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProduceGroup") +public class MesProduceGroupController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java index 0faa138..021d634 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java @@ -62,6 +62,8 @@ public class MesCarSeriesLoosePartService extends BaseMesService implements IMesProduceGroupService { + + @Override + protected void setPackQueryBean(MesProduceGroup bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getPgCode(), "pgCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPgName(), "pgName", packBean); + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java index 1f08866..b4a8045 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -9,4 +11,12 @@ import org.springframework.stereotype.Service; @Slf4j public class MesWorkCellService extends BaseMesService implements IMesWorkCellService { + @Override + protected void setPackQueryBean(MesWorkCell bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCellName(), "workCellName", packBean); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 39e28f0..9f73420 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -274,8 +274,8 @@ public class MesWorkOrderService extends BaseMesService implements DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partNameRdd", packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "customerPartNo", packBean); - DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderType(), "workOrderType", packBean); DdlPreparedPack.getStringBiggerPack(bean.getCreateDateTimeStart(), "createDatetime", packBean); From 14d23ee8d3653aee7182897edb8377326ebf3311 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 9 Jun 2024 16:43:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 9f73420..60d309e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -229,7 +229,7 @@ public class MesWorkOrderService extends BaseMesService implements } } //在加工的工单不能修改物料信息 - if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.process.getValue()) { + if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) { if (!Objects.equals(bean.getPartNo(), result.getPartNo())) { MesException.throwMesBusiException(String.format("工单状态为【%s】不允许修改物料", MesExtEnumUtil.ORDER_TYPE.valueOfDescription(result.getWorkOrderStatus()))); @@ -532,7 +532,7 @@ public class MesWorkOrderService extends BaseMesService implements } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) { mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); } else { - mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue()); + mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()); } update(mesWorkOrder); @@ -583,7 +583,7 @@ public class MesWorkOrderService extends BaseMesService implements } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) { mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); } else { - mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue()); + mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()); } //获取生产版本 MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder); @@ -818,7 +818,7 @@ public class MesWorkOrderService extends BaseMesService implements @Override public List queryMesWorkOrderProcessToSap(String organizeCode) { List statusList = new ArrayList<>(); - statusList.add(MesExtEnumUtil.ORDER_STATUS.process.getValue()); + statusList.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()); // statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); From 2ba89b2cdf3787996cb8d94c26825909e1cffce3 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 9 Jun 2024 17:47:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?41238=20=E7=89=A9=E6=96=99bom=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9D=A1=E6=95=B0=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java | 4 +++- .../mes/apiservice/controller/base/MesBomController.java | 5 +++-- .../mes/apiservice/serviceimpl/base/MesBomService.java | 15 +++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java index a4911a6..d13d438 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.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.MesBom; import io.swagger.annotations.ApiOperation; @@ -28,7 +30,7 @@ public interface IMesBomService extends IBaseMesService { * @return 组织模型数据返回树结构 */ @ApiOperation(value = "查询BOM树结构") - List queryMesDataTree(MesBom bom); + ListPager queryMesDataTree(MesBom bom, Pager pager); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java index bda2aa1..e5ea5dc 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IMesBomService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesBom; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -40,11 +41,11 @@ public class MesBomController extends BaseMesController { @GetMapping(value = "/tree/query") @ApiOperation(value = "查询MES组织模型数据返回树结构-获取所有") - public ResultBean queryMesDataTree(MesBom bom) { + public ResultBean queryMesDataTree(MesBom bom, Pager pager) { try { bom.setOrganizeCode(AuthUtil.getOrganizeCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(bomService.queryMesDataTree(bom)); + .setListPager(bomService.queryMesDataTree(bom,pager)); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 0f67529..f29f5b2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -4,6 +4,9 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesBomService; import cn.estsh.i3plus.ext.mes.pojo.model.MesBomTreeModel; import cn.estsh.i3plus.platform.common.util.MesConstWords; 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.MesBom; @@ -54,7 +57,7 @@ public class MesBomService extends BaseMesService implements IMesBomServ * @return */ @Override - public List queryMesDataTree(MesBom bom) { + public ListPager queryMesDataTree(MesBom bom, Pager pager) { List resultList = new ArrayList(); ValidatorBean.checkNotNull(bom.getPartNo(), "零件号不能为空"); MesBomTreeModel organize = new MesBomTreeModel(); @@ -63,14 +66,18 @@ public class MesBomService extends BaseMesService implements IMesBomServ // organize.setName("LML"); organize.setName(AuthUtil.getOrganize().getName()); - List bomList = baseRDao.findByProperty(new String[]{MesConstWords.IS_VALID, MesConstWords.IS_DELETED, MesConstWords.ORGANIZE_CODE, "partNo"}, - new Object[]{CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue(), bom.getOrganizeCode(), bom.getPartNo()}); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + packBean.setOrderByStr(bom.getOrderByParam()) ; + pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean)); + + List bomList = baseRDao.findByHqlWherePage(packBean, pager); recursionBomList(bomList); organize.setChildTreeList(bomList); resultList.add(organize); - return resultList; + return new ListPager<>(resultList, pager); } /**