diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java index 87bafff..488683f 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.api.base; + import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; /** diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index 7bb3b8f..17e38f1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -152,7 +152,7 @@ public abstract class BaseMesController extends BaseControll @ApiOperation(value = "查询信息带分页", notes = "组合查询,外带分页功能") public ResultBean queryByPager(T bean, Pager pager) { try { - bean.setOrganizeCode("CK01"); + bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); ListPager listPager = getBaseService().queryPager(bean, pager); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) 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 5bed39e..06536f0 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,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService; import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService; import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService; import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords; @@ -82,7 +83,7 @@ public class ExtProdOrgController extends MesBaseController { ListPager listPager = null; - ProdOrgExtModel.setOrganizeCode("CK01"); + ProdOrgExtModel.setOrganizeCode(AuthUtilExt.getOrganizeCode()); //工厂 if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_ONE.getValue() == ProdOrgExtModel.getLevel()) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java index 2f5b26f..32532d4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java @@ -40,7 +40,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and msd.is_deleted = :isDeleted "); hql.append(" and msd.is_valid = :isValid "); - hql.append(" and msd.shipping_order_no = :shippingOrderNo "); + hql.append(" and msd.pid = :pid "); hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit "); @@ -48,7 +48,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde query.setParameter("organizeCode", detail.getOrganizeCode()); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - query.setParameter("shippingCode", detail.getShippingCode()); + query.setParameter("pid", detail.getPid()); List list = query.getResultList(); @@ -68,8 +68,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" where msd.organize_code = :organizeCode "); hql.append(" and msd.is_deleted = :isDeleted "); hql.append(" and msd.is_valid = :isValid "); - - hql.append(" and msd.shipping_order_no = :shippingOrderNo "); + hql.append(" and msd.pid = :pid "); hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit "); @@ -77,7 +76,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde query.setParameter("organizeCode", detail.getOrganizeCode()); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - query.setParameter("shippingCode", detail.getShippingCode()); + query.setParameter("pid", detail.getPid()); query.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java index b4c2450..28d88ff 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java @@ -101,7 +101,7 @@ public abstract class BaseMesService implements IBaseMesServ public T update(T bean) { onUpdateBean(bean); T originBean = baseRDao.getById(bean.getId()); - onModifyBean(); + onModifyBean(bean,originBean); ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName()); baseRDao.update(bean); return originBean; @@ -170,7 +170,7 @@ public abstract class BaseMesService implements IBaseMesServ protected void onUpdateBean(T item) { } - protected void onModifyBean() { + protected void onModifyBean(T destItem,T srcItem) { } protected void setBeanModel(List list) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java index 908206c..710f3f3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java @@ -22,8 +22,8 @@ public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService im .build(); } } + + @Override + protected void onModifyBean(MesPartProdGroup destItem,MesPartProdGroup srcItem) { + String userName = AuthUtilExt.getUserName(); + //如果主表产线代码修改,明细产线代码也要更新 + if(!Objects.equals(destItem.getWorkCenterCode(),srcItem.getWorkCenterCode()) + || !Objects.equals(destItem.getPartProdGroupName(),srcItem.getPartProdGroupName())){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(srcItem.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(srcItem.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean); + + mesPartProdGroupDetailRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime","workCenterCode","partProdGroupName"}, + new Object[]{userName, TimeTool.getNowTime(true),destItem.getWorkCenterCode(),destItem.getPartProdGroupName()},ddlPackBean); + } + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java index edd1e8e..b388449 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java @@ -21,8 +21,8 @@ public class MesProdRuleSortCfgService extends BaseMesService implements MesPart mesPart = iMesPartService.getPartByPartNo(item.getPartNo(), item.getOrganizeCode()); item.setPartNameRdd(mesPart.getPartName()); item.setUnit(mesPart.getUnit()); - + //生产时间新增取当天 + if(StringUtil.isEmpty(item.getProduceTime())){ + item.setProduceTime(TimeTool.getToday()); + } } @@ -455,6 +458,7 @@ public class MesWorkOrderService extends BaseMesService implements } catch (Exception e) { MesException.throwMesBusiException("时间格式异常"); } + item.setProduceTime(item.getPlanDate()); } @Override diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 100c30e..df08d06 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -75,11 +75,11 @@ public class MesSpotCheckOrderService extends BaseMesService .build(); } - if (equipmentSpotCheck.getTriggerMode() == MesExtEnumUtil.EQUIPMENT_SPOT_CHECK_TRIGGER_MODE.TIME.getValue()) { + if (equipmentSpotCheck.getTriggerMode() == MesExtEnumUtil.EQUIPMENT_CHECK_INSPECTION_TRIGGER_METHOD.TIME_TRIGGERED.getValue()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】点检方案触发方式为【%s】,请勿手动创建", bean.getSpotCheckId(), MesExtEnumUtil.EQUIPMENT_SPOT_CHECK_TRIGGER_MODE.TIME.getDescription()) + .setErrorDetail("【%s】点检方案触发方式为【%s】,请勿手动创建", bean.getSpotCheckId(), MesExtEnumUtil.EQUIPMENT_CHECK_INSPECTION_TRIGGER_METHOD.TIME_TRIGGERED.getDescription()) .build(); } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java index 3479b9a..30156bc 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java @@ -16,6 +16,7 @@ public class MesCommonConstant { public static final String SPOT_CHECK_ORDER_TASK_RESOURCE = "MES"; + //点检单据号 public static final String SPOT_CHECK_ORDER_NO_RULE = "SPOT_CHECK_ORDER_NO_RULE"; /*** * 工单 报工