From 3bcb6f62231abfa2d4f5e2301cdb2b99336cd597 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 17 May 2024 10:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/BaseExtDataController.java | 38 +++++++++++++++++----- .../controller/base/ExtProdOrgController.java | 2 -- .../controller/base/MesExtEnumController.java | 19 +++++++++++ .../apiservice/daoimpl/SapProductPlanDaoImpl.java | 21 +++++++++--- .../serviceimpl/base/MesWorkOrderService.java | 8 +++++ 5 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesExtEnumController.java diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java index 0b08b47..a5fe55c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java @@ -1,4 +1,4 @@ -/* +package cn.estsh.i3plus.ext.mes.apiservice.controller.base;/* package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IMesEnumExtService; @@ -57,19 +57,39 @@ import java.util.Map; import java.util.stream.Collectors; */ + +import cn.estsh.i3plus.ext.mes.api.base.IMesEnumExtService; +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +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 com.alibaba.excel.util.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + /** * @Description: * @Reference: * @Author: yiming.gu * @CreateDate:2019-05-06-9:51 * @Modify: - **//* + **/ @RestController @Api(description = "MES基础数据") @RequestMapping(MesCommonConstant.MES_YANFEN + "/base-data") public class BaseExtDataController extends MesBaseController { - +/* public static final Logger LOGGER = LoggerFactory.getLogger(BaseExtDataController.class); @Autowired @@ -101,10 +121,10 @@ public class BaseExtDataController extends MesBaseController { @Autowired private IMethodService methodService; @Autowired - private IActionMethodService actionMethodService; + private IActionMethodService actionMethodService;*/ @Autowired private IMesEnumExtService enumService; - @Autowired + /*@Autowired private IButtonStatusService buttonStatusService; @Autowired private IEquipmentService equipmentService; @@ -4935,7 +4955,7 @@ public class BaseExtDataController extends MesBaseController { */ -/*************MES 枚举信息*****start***********//* +/*************MES 枚举信息*****start***********/ @GetMapping(value = "/enumlist") @ApiOperation(value = "获取MES系统所有枚举") @@ -4961,7 +4981,7 @@ public class BaseExtDataController extends MesBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - +/* @GetMapping(value = "/enumlist-db") @ApiOperation(value = "获取MES系统所有枚举或指定枚举") public ResultBean getEnumList(@RequestParam(name = "enumName", required = false) String enumName) { @@ -8366,6 +8386,6 @@ public class BaseExtDataController extends MesBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - -} */ +} + diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java index 8b1398c..ebb0d16 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java @@ -5,11 +5,9 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService; import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService; -import cn.estsh.i3plus.mes.api.iservice.base.IEquipmentService; import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.MesConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesExtEnumController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesExtEnumController.java new file mode 100644 index 0000000..6a29d5a --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesExtEnumController.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.impp.framework.base.controller.MesBaseController; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +/** + * @Description : 请求枚举接口 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/17 9:36 + * @Modify: + **/ +@RestController +@Api(description = "MES基础数据") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/base-data") +public class MesExtEnumController extends MesBaseController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java index 69ff139..a5fcbfb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java @@ -15,6 +15,7 @@ import javax.persistence.EntityManager; import javax.persistence.Query; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @Description :SAP生产计划 @@ -43,10 +44,11 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao { //拼接查询条件 packWhere(sapProductPlan, hql); StringBuffer unionDataHql = new StringBuffer("select sap.plnum,mes.part_no,ifnull(mes.qty,0) as sumQty," + - "ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," + + "ifnull(mes.complete_qty,0) as completeQty,part.unit,sap.psttr,sap.pedtr,sap.l_str," + "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user"); StringBuilder unionHql = new StringBuilder(); unionHql.append(" from sap_product_plan sap right join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " + + " left join mes_part part on part.part_no = mes.part_no " + "where mes.is_deleted=:isDeleted and mes.is_valid=:isValid and mes.organize_code=:organizeCode and sap.id is null "); //拼接查询条件 packWhere(sapProductPlan, unionHql); @@ -66,9 +68,20 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao { List list = new ArrayList<>(); for (Object result : resultList) { Object[] cells = (Object[]) result; - SapProductPlan tjMgnBoardModel = new SapProductPlan(String.valueOf(cells[0]), String.valueOf(cells[1]), Double.valueOf(String.valueOf(cells[2])), - Double.valueOf(String.valueOf(cells[3])),String.valueOf(cells[4]), String.valueOf(cells[5]), String.valueOf(cells[6]), String.valueOf(cells[7]), - String.valueOf(cells[8]), String.valueOf(cells[9]), String.valueOf(cells[10]), String.valueOf(cells[11]), String.valueOf(cells[12])); + SapProductPlan tjMgnBoardModel = new SapProductPlan( + Objects.isNull(cells[0])?"":String.valueOf(cells[0]), + Objects.isNull(cells[1])?"":String.valueOf(cells[1]), + Objects.isNull(cells[2])?0:Double.parseDouble(String.valueOf(cells[2])), + Objects.isNull(cells[3])?0:Double.parseDouble(String.valueOf(cells[3])), + Objects.isNull(cells[4])?"":String.valueOf(cells[4]), + Objects.isNull(cells[5])?"":String.valueOf(cells[5]), + Objects.isNull(cells[6])?"":String.valueOf(cells[6]), + Objects.isNull(cells[7])?"":String.valueOf(cells[7]), + Objects.isNull(cells[8])?"":String.valueOf(cells[8]), + Objects.isNull(cells[9])?"":String.valueOf(cells[9]), + Objects.isNull(cells[10])?"":String.valueOf(cells[10]), + Objects.isNull(cells[11])?"":String.valueOf(cells[11]), + Objects.isNull(cells[12])?"":String.valueOf(cells[12])); list.add(tjMgnBoardModel); } return new ListPager<>(list, pager); 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 7b462b2..be715f3 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 @@ -393,6 +393,13 @@ public class MesWorkOrderService extends BaseMesService implements GenSerialNoModel genSerialNoModel = new GenSerialNoModel("REPORT_SN"); genSerialNoModel.setPartNo(mesWorkOrder.getPartNo()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, mesWorkOrder.getCreateUser(), mesWorkOrder.getOrganizeCode(), mesWorkOrder.getNum()).getResultList(); + //查询产线信息 + ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", ddlPackBean); + MesWorkCenter mesWorkCenter = mesWorkCenterRDao.getByProperty(ddlPackBean); + if (Objects.isNull(mesWorkCenter)) { + MesException.throwMesBusiException("产线【%s】不存在", mesWorkOrder.getWorkCenterCode()); + } //保存数据 List mesProductOffLineList = new ArrayList<>(); MesProductOffLine newMesProductOffLine; @@ -416,6 +423,7 @@ public class MesWorkOrderService extends BaseMesService implements newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode()); newMesProductOffLine.setReportType(mesWorkOrder.getReportType()); + newMesProductOffLine.setSapWorkCenter(mesWorkCenter.getSapWorkCenter()); newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode()); ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser());