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-wuhan' into dev-wuhan

Browse Source
tags/yfai-mes-ext-v2.3
yxw 7 months ago
parent 812a821843 bcadbdb396
commit e6782d4b76
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/WebServiceConfig.java
Unescape Escape View File

@ -21,6 +21,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.config;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice.WebServiceServer;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice.WebServiceServerIns;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice.WebServiceServerSPS;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.servlet.CXFServlet;
@ -63,4 +64,10 @@ public class WebServiceConfig {
endpoint.publish("/mes-service-instrument");
return endpoint;
}
@Bean
public Endpoint endpointSpsEqu() {
EndpointImpl endpoint = new EndpointImpl(bus, new WebServiceServerSPS());
endpoint.publish("/mes-service-spsEqu");
return endpoint;
}
}

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

@ -214,6 +214,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
pullingOrder.setPartName(mesWorkOrder.getPartName());
pullingOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
pullingOrder.setProduceSeq(StringUtil.isEmpty(mesWorkOrder.getProduceSeq()) ? 0 : mesWorkOrder.getProduceSeq());
pullingOrder.setOrderFlag(StringUtil.isEmpty(mesWorkOrder.getOrderFlag())?"":mesWorkOrder.getOrderFlag().substring(0,1));
ConvertBean.serviceModelInitialize(pullingOrder, userName);
mesPullingOrderInfoRepository.insert(pullingOrder);
@ -273,32 +274,26 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
//查询拉动单状态为已扫描=20的 拉动单
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(pullingGroupCode, "pullCode", seriesPackBean);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.SPS_PULL.getValue(), "pullOrderStatus", seriesPackBean);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PART_PULL_ORDER_TYPE.SPS_PULL.getValue(), "pullOrderType", seriesPackBean);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.JIS_PULL.getValue(), "pullOrderStatus", seriesPackBean);
DdlPreparedPack.getStringEqualPack(assemblyLine, "workCenterCode", seriesPackBean);
seriesPackBean.setWhereAppend(seriesPackBean.getWhereAppend() + " order by modifyDatetime desc");
MesPullingOrderInfo mesPullingOrder = baseRDao.getByProperty(seriesPackBean);
if (StringUtil.isEmpty(mesPullingOrder)) {
resultMap.put("success", false);
String message = "产线" + assemblyLine + "拉动组" + pullingGroupCode + "数据为空，请检查数据";
String message = "SPS拉动数据已扫描数据为空，请检查拉动单数据";
resultMap.put("message", message);
return resultMap;
}
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(pullingGroupCode, "pullCode", partPackBean);
partPackBean.setWhereAppend(partPackBean.getWhereAppend() + " order by modifyDatetime desc");
//List<MesPullingOrderInfo> byHqlWhere = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
resultMap.put("", mesPullingOrder);
resultMap.put("success", true);
String message = "更新SPS状态成功，已发送SPS信息给设备! id:" + mesPullingOrder.getId() + "Code:" + mesPullingOrder.getPullingOrderNo() + "产线" + assemblyLine + "拉动组" + pullingGroupCode + "";
resultMap.put("message", message);
//更新主表状态 源系统为25配料完成 现在-【已发送设备-30】
mesPullingOrder.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.SPS_PULL.getValue());
ConvertBean.serviceModelUpdate(mesPullingOrder, "WS.SPS");
baseRDao.update(mesPullingOrder);
String message = "更新SPS状态成功，已发送SPS信息给设备! id:" + mesPullingOrder.getId() + "Code:" + mesPullingOrder.getPullingOrderNo() + "产线" + assemblyLine + "拉动组" + pullingGroupCode + "";
resultMap.put("success", true);
resultMap.put("message", message);
return resultMap;
}

Write Preview
Loading…
Cancel
Save