jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

Browse Source
tags/yfai-mes-ext-v1.0
gsz 11 months ago
parent 93450bccbf 20f9e853cf
commit ca5426b7ec
14 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg;
/**

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
Unescape Escape View File

@ -152,7 +152,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
@ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
public ResultBean<T> queryByPager(T bean, Pager pager) {
try {
bean.setOrganizeCode("CK01");
bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
ListPager<T> listPager = getBaseService().queryPager(bean, pager);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())

3
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java
Unescape Escape View File

@ -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()) {

9
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java
Unescape Escape View File

@ -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());

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java
Unescape Escape View File

@ -101,7 +101,7 @@ public abstract class BaseMesService<T extends BaseBean> 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<T extends BaseBean> implements IBaseMesServ
protected void onUpdateBean(T item) {
}
protected void onModifyBean() {
protected void onModifyBean(T destItem,T srcItem) {
}
protected void setBeanModel(List<T> list) {

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java
Unescape Escape View File

@ -22,8 +22,8 @@ public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService<MesEquip
@Override
protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
DdlPreparedPack.getStringEqualPack(bean.getPid(),"pid",packBean);
// DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
DdlPreparedPack.getNumEqualPack(bean.getSourceId(),"sourceId",packBean);
}
@Override

18
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
Unescape Escape View File

@ -1,7 +1,9 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@ -18,6 +20,7 @@ import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@ -94,4 +97,19 @@ public class MesPartProdGroupService extends BaseMesService<MesPartProdGroup> 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);
}
}
}

12
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
Unescape Escape View File

@ -21,8 +21,8 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
protected void setPackQueryBean(MesProdRuleSortCfg bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(bean.getAssemblyPartNo(), "assemblyPartNo", packBean);
DdlPreparedPack.getStringLikerPack(bean.getAssemblyPartName(), "assemblyPartName", packBean);
}
@ -40,12 +40,12 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
//ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "partNo", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);
@ -64,12 +64,12 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
//ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "partNo", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
Unescape Escape View File

@ -23,7 +23,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
private IMesShippingOrderManagementDetailDao shippingOrderManagementDetailDao;
protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", packBean);
DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustOrderNo(), "custOrderNo", packBean);
}

1
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
Unescape Escape View File

@ -175,7 +175,6 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
detail.setCustPartNo(k.getCustPartNo());
detail.setPlanQty(1);
detail.setPid(finalBean.getId());
detail.setShippingCode(finalBean.getShippingCode());
detail.setOrganizeCode(k.getOrganizeCode());
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesTimeEfficientCfgService.java
Unescape Escape View File

@ -13,6 +13,6 @@ public class MesTimeEfficientCfgService extends BaseMesService<MesTimeEfficientC
protected void setPackQueryBean(MesTimeEfficientCfg bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getSourceId(), "sourceId", packBean);
DdlPreparedPack.getNumEqualPack(bean.getSourceId(), "sourceId", packBean);
}
}

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
Unescape Escape View File

@ -382,7 +382,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> 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<MesWorkOrder> implements
} catch (Exception e) {
MesException.throwMesBusiException("时间格式异常");
}
item.setProduceTime(item.getPlanDate());
}
@Override

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
Unescape Escape View File

@ -75,11 +75,11 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
.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();
}

1
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
Unescape Escape View File

@ -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";
/***
* 工单 报工

Write Preview
Loading…
Cancel
Save