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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
tags/yfai-mes-ext-v1.0
LML丶 12 months ago
parent 0d187a5036 3d5058f5ad
commit 2f02ede5e8
9 changed files with 131 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,13 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
/**
* @Description :Maximo设备主数据
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/17 10:06
* @Modify:
**/
public interface IMesMaximoAssetMainDataService extends IBaseMesService<MesMaximoAssetMainData> {
}

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

@ -0,0 +1,13 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
/**
* @Description :Maximo仪表主数据
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/17 10:06
* @Modify:
**/
public interface IMesMaximoMeterMainDataService extends IBaseMesService<MesMaximoMeterMainData> {
}

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

@ -0,0 +1,18 @@
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.MesMaximoAssetMainData;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description :
* @Reference :
* @Author : gsz
* @CreateDate : 2024-05-17 10:16
* @Modify:
**/
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoAssetMainData")
public class MesMaximoAssetMainDataController extends BaseMesController<MesMaximoAssetMainData>{
}

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

@ -0,0 +1,18 @@
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.MesMaximoMeterMainData;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description :
* @Reference :
* @Author : gsz
* @CreateDate : 2024-05-17 10:16
* @Modify:
**/
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoMeterMainData")
public class MesMaximoMeterMainDataController extends BaseMesController<MesMaximoMeterMainData>{
}

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

@ -35,7 +35,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
public ListPager<SapProductPlan> querySapProductPlanPager(SapProductPlan sapProductPlan, Pager pager) {
//查询数据
StringBuffer dataHql = new StringBuffer("select sap.plnum,sap.plmat,ifnull(sap.gsmng,0) as sumQty," +
"ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
"ifnull(mes.reported_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
"sap.plwrk,sap.create_date_time,sap.create_user,sap.modify_date_time,sap.modify_user");
StringBuilder hql = new StringBuilder();
hql.append(" from sap_product_plan sap left join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +
@ -44,7 +44,7 @@ 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,part.unit,sap.psttr,sap.pedtr,sap.l_str," +
"ifnull(mes.reported_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 " +

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

@ -0,0 +1,29 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoAssetMainDataService;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @Description : Maximo设备主数据
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/17 10:06
* @Modify:
**/
@Service
@Slf4j
public class MesMaximoAssetMainDataServiceImpl extends BaseMesService<MesMaximoAssetMainData> implements IMesMaximoAssetMainDataService {
protected void setPackQueryBean(MesMaximoAssetMainData bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean);
DdlPreparedPack.getStringEqualPack(bean.getStatus(), "status", packBean);
DdlPreparedPack.getStringEqualPack(bean.getFailureCode(), "failureCode", packBean);
}
}

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

@ -0,0 +1,28 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoMeterMainDataService;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @Description : Maximo仪表主数据
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/17 10:06
* @Modify:
**/
@Service
@Slf4j
public class MesMaximoMeterMainDataServiceImpl extends BaseMesService<MesMaximoMeterMainData> implements IMesMaximoMeterMainDataService {
protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
DdlPreparedPack.getNumEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
DdlPreparedPack.getStringEqualPack(bean.getMeterName(), "meterName", packBean);
}
}

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

@ -320,8 +320,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
ValidatorBean.checkNotNull(item.getPlanStartTime(), "计划开始时间不能为空");
ValidatorBean.checkNotNull(item.getPlanEndTime(), "计划结束时间不能为空");
//拼接
item.setPlanStartTime(item.getPlanStartTime() + " " + "00:00:00");
item.setPlanEndTime(item.getPlanEndTime() + " " + "23:59:59");
// item.setPlanStartTime(item.getPlanStartTime() + " " + "00:00:00");
// item.setPlanEndTime(item.getPlanEndTime() + " " + "23:59:59");
}
//物料名称不存在，从物料信息中获取
if (StringUtil.isEmpty(item.getPartNameRdd())) {

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

@ -2,21 +2,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.ext.mes.api.busi.IMaximoService;
import cn.estsh.i3plus.ext.mes.pojo.model.MaximoParamModel;
import cn.estsh.i3plus.icloud.softswitch.sdk.IBsSuitServiceCloud;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.HttpClientTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MaximoAssetMainData;
import cn.estsh.i3plus.pojo.mes.bean.MaximoMeterMainData;
import cn.estsh.i3plus.pojo.mes.repository.IMaximoAssetMainDataRepository;
import cn.estsh.i3plus.pojo.mes.repository.IMaximoMeterMainDataRepository;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoAssetMainDataRepository;
import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoMeterMainDataRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,10 +29,10 @@ public class MaximoServiceImpl implements IMaximoService {
private static final Logger LOGGER = LoggerFactory.getLogger(MaximoServiceImpl.class);
@Autowired
private IMaximoAssetMainDataRepository maximoAssetMainDataRDao;
private IMesMaximoAssetMainDataRepository maximoAssetMainDataRDao;
@Autowired
private IMaximoMeterMainDataRepository maximoMeterMainDataRDao;
private IMesMaximoMeterMainDataRepository maximoMeterMainDataRDao;
@Override
@ -59,7 +51,7 @@ public class MaximoServiceImpl implements IMaximoService {
return resultMap;
}
try {
MaximoMeterMainData maximoMeterMainData = new MaximoMeterMainData();
MesMaximoMeterMainData maximoMeterMainData = new MesMaximoMeterMainData();
maximoMeterMainData.setOrganizeCode(paramModel.getSiteId());
maximoMeterMainData.setMeterName(paramModel.getMeterName());
maximoMeterMainData.setAssetNum(paramModel.getAssetNum());
@ -107,7 +99,7 @@ public class MaximoServiceImpl implements IMaximoService {
return resultMap;
}
try {
MaximoAssetMainData maximoAssetMainData = new MaximoAssetMainData();
MesMaximoAssetMainData maximoAssetMainData = new MesMaximoAssetMainData();
maximoAssetMainData.setOrganizeCode(paramModel.getSiteId());
maximoAssetMainData.setAssetNum(paramModel.getAssetNum());
maximoAssetMainData.setDescription(paramModel.getDescription());

Write Preview
Loading…
Cancel
Save