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

优化电测试

Browse Source
tags/yfai-pcn-ext-v2.3
臧学普 7 months ago
parent b8ec695def
commit 409c979c0e
6 changed files with 247 additions and 40 deletions
Show Stats Download Patch File Download Diff File

21
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IDcsForEquipmentService.java
Unescape Escape View File

@ -1,13 +1,14 @@
package cn.estsh.i3plus.ext.mes.pcn.api.busi;
import cn.estsh.i3plus.pojo.mes.model.MesReturnModel;
public interface IDcsForEquipmentService {
String doGetConsoleItemCode(String organizeCode,String barcode,String custCode,String custPlantCode,String workCenterCode, String workCellCode);
String doGetConsoleItemCode(String barcode,String custCode,String custPlantCode,String workCenterCode, String workCellCode);
/**
*
* @param organizeCode
* @param barcode
* @param partNo 客户零件号
* @param result
@ -16,5 +17,19 @@ public interface IDcsForEquipmentService {
* @param custCode
* @return
*/
String doFillConsoleResultExt(String organizeCode,String barcode,String partNo,String result,String workCenterCode, String workCellCode,String custCode);
String doFillConsoleResultExt(String barcode,String partNo,String result,String workCenterCode, String workCellCode,String custCode);
/**
* 根据主条码查询零件号
* @param organizeCode
* @param barcode
* @param custCode
* @param custPlantCode
* @return
*/
String doGetConsoleItemCode(String organizeCode,String barcode, String custCode, String custPlantCode);
String doFillConsoleResult(String organizeCode,String barcode, String partNO, String result, String assemblyLine, String location);
MesReturnModel doGetConsoleItemCodeAndProcess(String organizeCode, String barcode, String custCode, String custPlantCode);
}

14
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/model/MesFillConsoleResult.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.model;
import lombok.Data;
@Data
public class MesFillConsoleResult {
private String barcode;
private String partNO;
private String result;
private String assemblyLine;
private String location;
private String organizeCode;
}

20
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/model/MesGetConsoleItemCode.java
Unescape Escape View File

@ -0,0 +1,20 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.model;
import lombok.Data;
/**
* 点测试 GetConsoleItemCodeExt
*/
@Data
public class MesGetConsoleItemCode {
//主条码
private String barcode;
//客户编码
private String custCode;
//客户工厂
private String custPlantCode;
//工厂代码
private String plant;
}

19
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/model/MesGetConsoleItemCodeAndProcess.java
Unescape Escape View File

@ -0,0 +1,19 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.model;
import lombok.Data;
/**
* 点测试 GetConsoleItemCodeExt
*/
@Data
public class MesGetConsoleItemCodeAndProcess {
//主条码
private String barcode;
//客户编码
private String custCode;
//客户工厂
private String custPlantCode;
//工厂代码
private String plant;
}

135
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java
Unescape Escape View File

@ -7,13 +7,17 @@ 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.*;
import cn.estsh.i3plus.pojo.mes.model.MesReturnModel;
import cn.estsh.i3plus.pojo.mes.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Locale;
@Slf4j
@Service
public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService {
@ -33,8 +37,12 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService {
@Autowired
private MesCustomerPartRepository customerPartRao;
@Autowired
private MesProductionRecordRepository recordRao;
@Override
public String doGetConsoleItemCode(String organizeCode,String barcode, String custCode, String custPlantCode, String workCenterCode, String workCellCode) {
public String doGetConsoleItemCode(String barcode, String custCode, String custPlantCode, String workCenterCode, String workCellCode) {
//通用二维码组成部分('RS'为记录分隔符ASCII:30，'GS'为分组符ASCII:29,'EOT'为传输结束符ASCII:04)
//[)>+'RS'+06+'GS'+Y+vpps+'GS'+P+8位客户零件号+'GS'+12V+DUNS+'GS'+T+1位line num+1位班次号+2位年份+3位天数+1位追溯(精确追溯A，批次追溯@)+2工程更改记录+2位自定义+4位流水号+'RS'+'EOT'
//如：[)>+'RS'+06+'GS'+Y+4110000000000X+'GS'+P+12345678+'GS'+12V+545295227+'GS'+T+1A13304A2B4C0001+'RS'+'EOT'
@ -43,21 +51,23 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService {
barcode = mesCustomerSnTransformService.transformBarCodeGm(barcode);
//todo 读取配置文件 获取工厂
if (StringUtils.isBlank(organizeCode)) {
String organizeCode;
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack("ORGANIZE_CODE","cfgCode",ddlPackBean);
DdlPreparedPack.getStringEqualPack("ORGANIZE_CODE","cfgKey",ddlPackBean);
List<MesConfig> organizeConfig = mesConfigRao.findByHqlWhere(ddlPackBean);
if (!organizeConfig.isEmpty()) {
organizeCode = organizeConfig.get(0).getCfgValue();
}else {
log.error("请在mes_cfg中配置工厂代码,cfgCode为ORGANIZE_CODE");
return "2";
}
}
//2.根据条码表查询一条，排序条码表条码唯一
DdlPackBean producePackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(barcode,"custSn",producePackBean);
DdlPreparedPack.getStringEqualPack(barcode,"productSn",producePackBean);
DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), producePackBean);
List<MesProduceSn> produceSnList = mesProduceSnRao.findByHqlTopWhere(producePackBean, 1);
String custPartNo="";
//4.如果在条码表中能查询出数据，插入到scanMonitor一条记录
if (!produceSnList.isEmpty()) {
MesPcScanLog scanLog = new MesPcScanLog();
@ -69,23 +79,35 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService {
ConvertBean.saveOrUpdate(scanLog,"JOB");
scanLogRao.insert(scanLog);
//4.返回客户条码
return produceSnList.get(0).getCustPartNo();
custPartNo = produceSnList.get(0).getCustPartNo();
String partNo = produceSnList.get(0).getPartNo();
if (StringUtils.isEmpty(custPartNo)){
//根据erpPartNo查询客户零件号
DdlPackBean custPartPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(partNo,"erpPartNo",custPartPackBean);
if (!StringUtils.isEmpty(custCode)){
DdlPreparedPack.getStringEqualPack(custPartNo,"custCode",custPartPackBean);
}
List<MesCustomerPart> customerPartList = customerPartRao.findByHqlTopWhere(custPartPackBean, 1);
if (!customerPartList.isEmpty()) {
custPartNo = customerPartList.get(0).getCustPartNo();
}
}
return custPartNo;
}
return "";
}
@Override
public String doFillConsoleResultExt(String organizeCode, String barcode, String partNo, String result, String workCenterCode, String workCellCode, String custCode) {
public String doFillConsoleResultExt( String barcode, String partNo, String result, String workCenterCode, String workCellCode, String custCode) {
barcode = mesCustomerSnTransformService.transformBarCodeGm(barcode);
if (StringUtils.isBlank(organizeCode)) {
String organizeCode="";
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack("ORGANIZE_CODE","cfgCode",ddlPackBean);
DdlPreparedPack.getStringEqualPack("ORGANIZE_CODE","cfgKey",ddlPackBean);
List<MesConfig> organizeConfig = mesConfigRao.findByHqlWhere(ddlPackBean);
if (!organizeConfig.isEmpty()) {
organizeCode = organizeConfig.get(0).getCfgValue();
}
}
MesPcScanLog scanLog = new MesPcScanLog();
scanLog.setScanTime(TimeTool.getNowTime(true));
@ -117,6 +139,95 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService {
return "1";
}
@Override
public String doGetConsoleItemCode(String organizeCode, String barcode, String custCode, String custPlantCode) {
//1.根据barcode 和 organizeCode查询条码表mes_produce_sn
DdlPackBean snPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(barcode,"produceSn",snPackBean);
List<MesProduceSn> produceSnList = mesProduceSnRao.findByHqlTopWhere(snPackBean, 1);
if (!produceSnList.isEmpty()) {
//2.查询生产记录表，如果生产记录数量 <= 0 return ""
DdlPackBean productionLogPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(barcode,"sn",productionLogPackBean);
int count = recordRao.findByHqlWhereCount(productionLogPackBean);
if (count <= 0){
return "";
}
//3.
MesProduceSn mesProduceSn = produceSnList.get(0);
MesPcScanLog scanLog = new MesPcScanLog();
scanLog.setScanTime(TimeTool.getNowTime(true));
scanLog.setWorkCenterCode("ZP1008");
scanLog.setWorkCellCode("ZP1008");
scanLog.setCustSn(barcode);
scanLog.setOrganizeCode(organizeCode);
ConvertBean.saveOrUpdate(scanLog,"webService-doGetConsoleItemCode");
scanLogRao.insert(scanLog);
return mesProduceSn.getCustPartNo();
}
return "";
}
@Override
public String doFillConsoleResult(String organizeCode,String barcode, String partNO, String result, String workCenterCode, String workCellCode) {
if (StringUtils.isBlank(organizeCode)) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack("ORGANIZE_CODE","cfgCode",ddlPackBean);
List<MesConfig> organizeConfig = mesConfigRao.findByHqlWhere(ddlPackBean);
if (!organizeConfig.isEmpty()) {
organizeCode = organizeConfig.get(0).getCfgValue();
}
}
MesPcScanLog scanLog = new MesPcScanLog();
scanLog.setScanTime(TimeTool.getNowTime(true));
scanLog.setWorkCenterCode(workCenterCode);
scanLog.setWorkCellCode(workCellCode);
scanLog.setCustSn(barcode);
scanLog.setOrganizeCode(organizeCode);
scanLog.setRemark(partNO+":"+result);
ConvertBean.saveOrUpdate(scanLog,"JOB");
scanLogRao.insert(scanLog);
return "1";
}
@Override
public MesReturnModel doGetConsoleItemCodeAndProcess(String organizeCode, String barcode, String custCode, String custPlantCode) {
MesReturnModel mesReturnModel = new MesReturnModel();
//1.根据barcode 和 organizeCode查询条码表mes_produce_sn
DdlPackBean snPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(barcode,"productSn",snPackBean);
List<MesProduceSn> produceSnList = mesProduceSnRao.findByHqlTopWhere(snPackBean, 1);
if (!produceSnList.isEmpty()) {
//2.查询生产记录表，如果生产记录数量 <= 0 return ""
DdlPackBean productionLogPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(barcode,"productSn",productionLogPackBean);
DdlPreparedPack.getOrderBy("createDatetime",CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),productionLogPackBean);
List<MesProductionRecord> productionRecords = recordRao.findByHqlTopWhere(productionLogPackBean,1);
if (!productionRecords.isEmpty()){
String processCode = productionRecords.get(0).getProcessCode();
mesReturnModel.setProcessCode(processCode);
}
//3.
MesProduceSn mesProduceSn = produceSnList.get(0);
mesReturnModel.setPartNo(mesProduceSn.getPartNo());
MesPcScanLog scanLog = new MesPcScanLog();
scanLog.setScanTime(TimeTool.getNowTime(true));
scanLog.setWorkCenterCode("ZP1008");
scanLog.setWorkCellCode("ZP1008");
scanLog.setCustSn(barcode);
scanLog.setOrganizeCode(organizeCode);
ConvertBean.saveOrUpdate(scanLog,"webService-doGetConsoleItemCodeAndProcess");
scanLogRao.insert(scanLog);
return mesReturnModel;
}
return mesReturnModel;
}
private String createBarCode(String barcode){
String barcodeResult = "";

78
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/webservice/DcsForEquipmentServer.java
Unescape Escape View File

@ -1,8 +1,8 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.webservice;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.model.MesConsoleItemCodeExt;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.model.MesConsoleResultExt;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.model.*;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.DcsForEquipmentServiceImpl;
import cn.estsh.i3plus.pojo.mes.model.MesReturnModel;
import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -16,35 +16,63 @@ import javax.jws.WebService;
@WebService(targetNamespace = "http://tempuri.org/")
public class DcsForEquipmentServer {
public static final Logger LOGGER = LoggerFactory.getLogger(DcsForEquipmentServer.class);
@WebMethod(action = "GetConsoleItemCodeExt", operationName = "GetConsoleItemCodeExt")
public String getConsoleItemCodeExt(@WebParam(name = "GetConsoleItemCodeExt") MesConsoleItemCodeExt mesConsoleItemCodeExt) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
String organizeCode = mesConsoleItemCodeExt.getOrganizeCode();
String custCode = mesConsoleItemCodeExt.getCustCode();
String assemblyLine = mesConsoleItemCodeExt.getAssemblyLine();
String location = mesConsoleItemCodeExt.getLocation();
String barcode = mesConsoleItemCodeExt.getBarcode();
String custPlantCode = mesConsoleItemCodeExt.getCustPlantCode();
return bean.doGetConsoleItemCode(organizeCode,barcode,custCode,custPlantCode,assemblyLine,location);
}
// @WebMethod(action = "GetConsoleItemCodeExt", operationName = "GetConsoleItemCodeExt")
// public String getConsoleItemCodeExt(@WebParam(name = "organizeCode") String organizeCode, @WebParam(name = "custCode") String custCode,@WebParam(name = "assemblyLine")String assemblyLine,@WebParam(name = "location")String location,@WebParam(name = "barcode")String barcode,@WebParam(name = "custPlantCode")String custPlantCode) {
// DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("DcsForEquipmentServiceImpl");
// public String getConsoleItemCodeExt(@WebParam(name = "GetConsoleItemCodeExt") MesConsoleItemCodeExt mesConsoleItemCodeExt) {
// DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
// String organizeCode = mesConsoleItemCodeExt.getOrganizeCode();
// String custCode = mesConsoleItemCodeExt.getCustCode();
// String assemblyLine = mesConsoleItemCodeExt.getAssemblyLine();
// String location = mesConsoleItemCodeExt.getLocation();
// String barcode = mesConsoleItemCodeExt.getBarcode();
// String custPlantCode = mesConsoleItemCodeExt.getCustPlantCode();
// return bean.doGetConsoleItemCode(organizeCode,barcode,custCode,custPlantCode,assemblyLine,location);
// }
@WebMethod(action = "GetConsoleItemCodeExt", operationName = "GetConsoleItemCodeExt")
public String getConsoleItemCodeExt(@WebParam(name = "barcode")String barcode, @WebParam(name = "custCode") String custCode,@WebParam(name = "custPlantCode")String custPlantCode,@WebParam(name = "assemblyLine")String assemblyLine,@WebParam(name = "location")String location) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
return bean.doGetConsoleItemCode(barcode,custCode,custPlantCode,assemblyLine,location);
}
@WebMethod(action = "FillConsoleResultExt", operationName = "FillConsoleResultExt")
public String getConsoleItemCodeExt(@WebParam(name = "FillConsoleResultExt") MesConsoleResultExt mesConsoleResultExt) {
public String getConsoleItemCodeExt(@WebParam(name = "barcode")String barcode, @WebParam(name = "partNO") String partNO, @WebParam(name = "result") String result,@WebParam(name = "assemblyLine")String assemblyLine,@WebParam(name = "location")String location,@WebParam(name = "custCode") String custCode) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
return bean.doFillConsoleResultExt(barcode,partNO,result,assemblyLine,location,custCode);
}
@WebMethod(action = "GetConsoleItemCode", operationName = "GetConsoleItemCode")
public String getConsoleItemCode(@WebParam(name = "GetConsoleItemCode") MesGetConsoleItemCode mesGetConsoleItemCode) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
String organizeCode = mesGetConsoleItemCode.getPlant();
String custCode = mesGetConsoleItemCode.getCustCode();
String barcode = mesGetConsoleItemCode.getBarcode();
String custPlantCode = mesGetConsoleItemCode.getCustPlantCode();
return bean.doGetConsoleItemCode(organizeCode,barcode,custCode,custPlantCode);
}
@WebMethod(action = "FillConsoleResult", operationName = "FillConsoleResult")
public String fillConsoleResult(@WebParam(name = "FillConsoleResult") MesFillConsoleResult mesFillConsoleResult) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
String organizeCode = mesFillConsoleResult.getOrganizeCode();
String assemblyLine = mesFillConsoleResult.getAssemblyLine();
String location = mesFillConsoleResult.getLocation();
String barcode = mesFillConsoleResult.getBarcode();
String result = mesFillConsoleResult.getResult();
String partNo = mesFillConsoleResult.getPartNO();
return bean.doFillConsoleResult(organizeCode,barcode,partNo,result,assemblyLine,location);
}
@WebMethod(action = "GetConsoleItemCodeAndProcess", operationName = "GetConsoleItemCodeAndProcess")
public MesReturnModel getConsoleItemCodeAndProcess(@WebParam(name = "GetConsoleItemCodeAndProcess") MesGetConsoleItemCodeAndProcess mesGetConsoleItemCodeAndProcess) {
DcsForEquipmentServiceImpl bean = (DcsForEquipmentServiceImpl) SpringContextsUtil.getBean("dcsForEquipmentServiceImpl");
String organizeCode = mesConsoleResultExt.getOrganizeCode();
String custCode = mesConsoleResultExt.getCustCode();
String assemblyLine = mesConsoleResultExt.getAssemblyLine();
String location = mesConsoleResultExt.getLocation();
String barcode = mesConsoleResultExt.getBarcode();
String result = mesConsoleResultExt.getResult();
String partNo = mesConsoleResultExt.getPartNO();
return bean.doFillConsoleResultExt(organizeCode,barcode,partNo,result,assemblyLine,location,custCode);
String organizeCode = mesGetConsoleItemCodeAndProcess.getPlant();
String custCode = mesGetConsoleItemCodeAndProcess.getCustCode();
String barcode = mesGetConsoleItemCodeAndProcess.getBarcode();
String custPlantCode = mesGetConsoleItemCodeAndProcess.getCustPlantCode();
return bean.doGetConsoleItemCodeAndProcess( organizeCode, barcode, custCode, custPlantCode);
}
}

Write Preview
Loading…
Cancel
Save