Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

主数据导入完善

Browse Source
Leon 4 years ago
parent ad1db37d71
commit c8e30f1f34
5 changed files with 152 additions and 15 deletions
Show Stats Download Patch File Download Diff File

19
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/NcGroupWSClient.java
Unescape Escape View File

@ -9,6 +9,8 @@ import com.sap.me.common.ObjectReference;
import com.sap.me.nonconformance.NcGroupConfigurationServiceInterface;
import com.sap.me.nonconformance.NcGroupFullConfiguration;
import com.sap.me.nonconformance.NcGroupValidOperation;
import com.visiprise.globalization.DateGlobalizationServiceInterface;
import com.visiprise.globalization.GlobalizationService;
import java.util.ArrayList;
import java.util.List;
@ -59,6 +61,7 @@ public class NcGroupWSClient {
String applyOperation = jsonObject.getString("applyOperation");
String ncGroupBo = HandleEnum.NC_GROUP.getHandle(site, ncGroup);
DateGlobalizationServiceInterface dateService = GlobalizationService.getInvariantService("com.visiprise.globalization.DateGlobalizationService");
//---------------------------------------------------------------------------------------------------
NcGroupConfigurationServiceInterface ncGroupConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcGroupConfigurationService", site);
NcGroupFullConfiguration ncGroupFullConfiguration = new NcGroupFullConfiguration();
@ -79,10 +82,18 @@ public class NcGroupWSClient {
list.add(ncGroupValidOperation);
}
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
} else if (StringUtil.notBlank(applyOperation)) {
List<NcGroupValidOperation> list = new ArrayList<>();
NcGroupValidOperation ncGroupValidOperation = new NcGroupValidOperation();
String operationBo = HandleEnum.OPERATION.getHandle(site, applyOperation, "#");
ncGroupValidOperation.setOperationRef(operationBo);
list.add(ncGroupValidOperation);
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
}
}
ncGroupFullConfiguration.setModifiedDateTime(dateService.createDateTime());
ncGroupConfigurationService.createNcGroup(ncGroupFullConfiguration);
} catch (Exception e) {
return ExceptionUtil.getExceptionMsg(e);
@ -105,6 +116,7 @@ public class NcGroupWSClient {
String applyAll = jsonObject.getString("applyAll");
String applyOperation = jsonObject.getString("applyOperation");
DateGlobalizationServiceInterface dateService = GlobalizationService.getInvariantService("com.visiprise.globalization.DateGlobalizationService");
//---------------------------------------------------------------------------------------------------
NcGroupConfigurationServiceInterface ncGroupConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcGroupConfigurationService", site);
ncGroupFullConfiguration.setDescription(description);
@ -122,6 +134,13 @@ public class NcGroupWSClient {
list.add(ncGroupValidOperation);
}
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
} else if (StringUtil.notBlank(applyOperation)) {
List<NcGroupValidOperation> list = new ArrayList<>();
NcGroupValidOperation ncGroupValidOperation = new NcGroupValidOperation();
String operationBo = HandleEnum.OPERATION.getHandle(site, applyOperation, "#");
ncGroupValidOperation.setOperationRef(operationBo);
list.add(ncGroupValidOperation);
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
}
}

30
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java
Unescape Escape View File

@ -39,13 +39,13 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum", "序号");
cvsHeadsMapping.put("resource", "资源编码");
cvsHeadsMapping.put("description", "资源描述");
cvsHeadsMapping.put("resource", "*设备（资源）命名（英文）");
cvsHeadsMapping.put("description", "设备（资源）描述");
cvsHeadsMapping.put("defaultOperation", "默认操作");
cvsHeadsMapping.put("status", "资源状态" );
cvsHeadsMapping.put("status", "设备（资源）状态" );
cvsHeadsMapping.put("setupStatus", "设置状态");
cvsHeadsMapping.put("processResource", "工艺资源");
cvsHeadsMapping.put("resourceType", "资源类型");
cvsHeadsMapping.put("resourceType", "设备(资源)类型");
cvsHeadsMapping.put("validFrom", "资源有效期从");
cvsHeadsMapping.put("validTo", "资源有效期到");
cvsHeadsMapping.put("certificate", "证明编号");
@ -56,7 +56,7 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum", "序号");
cvsHeadsMapping.put("workCenter", "工作中心名称");
cvsHeadsMapping.put("workCenter", "*工作中心名称(英文)");
cvsHeadsMapping.put("descriptionZH", "工作中心描述（中文）");
cvsHeadsMapping.put("descriptionEN", "工作中心描述（英文）");
cvsHeadsMapping.put("status", "状态");
@ -66,8 +66,8 @@ public class MasterObjectDefine {
cvsHeadsMapping.put("memberSeq", "序列号");
cvsHeadsMapping.put("memberType", "子工作中心类型");
cvsHeadsMapping.put("memberGBO", "工作中心或资源");
cvsHeadsMapping.put("ERPWC", "ERP工作中心");
cvsHeadsMapping.put("isERPWC", "是ERP工作中心");
cvsHeadsMapping.put("ERPWC", "ERP 工作中心");
cvsHeadsMapping.put("isERPWC", "是 ERP 工作中心");
break;
//工序主数据
@ -75,15 +75,15 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum","序号");
cvsHeadsMapping.put("operation", "工序名称");
cvsHeadsMapping.put("version", "工序版本");
cvsHeadsMapping.put("operation", "*关键工序名称（英文）");
cvsHeadsMapping.put("version", "*关键工序版本");
cvsHeadsMapping.put("currentVersion", "当前版本(是/否)");
cvsHeadsMapping.put("status", "状态");
cvsHeadsMapping.put("descriptionZH", "工序描述（中文）");
cvsHeadsMapping.put("descriptionEN", "工序描述（英文）");
cvsHeadsMapping.put("operationType", "操作类型");
cvsHeadsMapping.put("resourceType", "资源类型");
cvsHeadsMapping.put("defaultResource", "默认资源");
cvsHeadsMapping.put("status", "*状态");
cvsHeadsMapping.put("descriptionZH", "关键工序描述（中文）");
cvsHeadsMapping.put("descriptionEN", "关键工序描述（英文）");
cvsHeadsMapping.put("operationType", "*操作类型");
cvsHeadsMapping.put("resourceType", "*设备（资源）类型");
cvsHeadsMapping.put("defaultResource", "默认设备（资源）");
break;
//不合格代码组

12
integration/src/main/java/com/foreverwin/mesnac/integration/config/IntegrationConfiguration.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.foreverwin.mesnac.integration.config;
import com.foreverwin.mesnac.integration.service.CAPPAPIWebService;
import com.foreverwin.mesnac.integration.service.ERPAPIWebService;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
@ -22,6 +23,8 @@ public class IntegrationConfiguration {
private Bus bus;
@Autowired
private ERPAPIWebService ERPAPIWebService;
@Autowired
private CAPPAPIWebService CAPPAPIWebService;
@Bean
public Endpoint erpWebService() {
@ -30,4 +33,13 @@ public class IntegrationConfiguration {
endpoint.publish("/ERPAPIWebService");
return endpoint;
}
@Bean
public Endpoint cappWebService() {
EndpointImpl endpoint = new EndpointImpl(bus, CAPPAPIWebService);
//显示要发布的名称
endpoint.publish("/CAPPAPIWebService");
return endpoint;
}
}

21
integration/src/main/java/com/foreverwin/mesnac/integration/service/CAPPAPIWebService.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.foreverwin.mesnac.integration.service;
import com.foreverwin.mesnac.integration.dto.BomSyncRequest;
import com.foreverwin.mesnac.integration.dto.WebServiceResponse;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
@WebService(targetNamespace="http://service.integration.mesnac.com")
public interface CAPPAPIWebService {
/**
* 物料清单同步
*
* @param bomSyncRequest
* @return
*/
@WebMethod(action = "http://service.integration.mesnac.com/itemSync")
WebServiceResponse itemSync(@WebParam(name = "itemSyncRequest") BomSyncRequest bomSyncRequest);
}

85
integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/CAPPAPIWebServiceImpl.java
Unescape Escape View File

@ -0,0 +1,85 @@
package com.foreverwin.mesnac.integration.service.impl;
import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant;
import com.foreverwin.mesnac.common.util.ExceptionUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.integration.dto.BomSyncRequest;
import com.foreverwin.mesnac.integration.dto.WebServiceResponse;
import com.foreverwin.mesnac.integration.model.IntegrationLog;
import com.foreverwin.mesnac.integration.service.CAPPAPIWebService;
import com.foreverwin.mesnac.integration.service.IntegrationLogService;
import com.foreverwin.mesnac.integration.service.InterfaceService;
import com.foreverwin.modular.core.exception.BusinessException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.jws.WebService;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
@Component
@WebService(serviceName = "CAPPAPIWebService",
targetNamespace = "http://service.integration.mesnac.com",
endpointInterface = "com.foreverwin.mesnac.integration.service.CAPPAPIWebService")
public class CAPPAPIWebServiceImpl implements CAPPAPIWebService {
@Autowired
private InterfaceService interfaceService;
@Autowired
private IntegrationLogService integrationLogService;
@Override
public WebServiceResponse itemSync(BomSyncRequest bomSyncRequest) {
WebServiceResponse response = new WebServiceResponse();
String site = null;
try {
if (bomSyncRequest == null) {
throw BusinessException.build("传递的参数格式不正确，或者为空");
}
if (StringUtil.isBlank(bomSyncRequest.getTRANID())) {
throw BusinessException.build("参数【TRANID】不能为空");
}
if (StringUtil.isBlank(bomSyncRequest.getDATE_TIME())) {
throw BusinessException.build("参数【DATE_TIME】不能为空");
}
response.setHANDLE(bomSyncRequest.getTRANID());
response.setSTATUS("S");
site = bomSyncRequest.getSITE();
String shopOrder = bomSyncRequest.getSHOP_ORDER();
if (StringUtil.isBlank(site)) {
throw BusinessException.build("参数【SITE】不能为空");
}
//调用业务接口
interfaceService.bomSync(site, bomSyncRequest);
response.setMESSAGE("工单【" + shopOrder + "】BOM数据同步成功");
} catch (Exception e) {
response.setSTATUS("E");
response.setMESSAGE(ExceptionUtil.getExceptionMsg(e));
} finally {
//记录接口日志
IntegrationLog log = new IntegrationLog();
log.setHandle(UUID.randomUUID().toString());
log.setSite(site);
log.setIntegrationType(IntegrationTypeConstant.BOM);
log.setCategory("RESPONSE");
log.setIntegrationWay("ERP");
log.setIntegrationMethod("InterfaceService.shopOrderSync");
log.setParam(bomSyncRequest.toString());
log.setStatus(response.getSTATUS());
log.setResultMessage(response.getMESSAGE());
log.setTransactionId(bomSyncRequest.getTRANID());
log.setRequestDateTime(LocalDateTime.parse(bomSyncRequest.getDATE_TIME(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
log.setCreatedDateTime(LocalDateTime.now());
integrationLogService.saveIntegrationLog(log);
}
//接口返回
return response;
}
}
Write Preview
Loading…
Cancel
Save