Jcdm042-Mes-Module-One.git

2024-07-12 997e697edaf59893248bc2467223058b221a4de2

提交 \| 用户 \| 时间
0ca254	1	package com.jcdm.main.plcserver.sub;
A	2
	3
	4	import cn.hutool.core.collection.CollUtil;
	5	import cn.hutool.core.util.ObjectUtil;
	6	import cn.hutool.core.util.StrUtil;
109e2f	7	import cn.hutool.http.HttpRequest;
C	8	import cn.hutool.http.HttpResponse;
ef58b9	9	import cn.hutool.json.JSONObject;
109e2f	10	import cn.hutool.json.JSONUtil;
0ca254	11	import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
ef58b9	12	import com.jcdm.common.core.domain.AjaxResult;
0ca254	13	import com.jcdm.framework.websocket.WebSocketUsers;
A	14	import com.jcdm.main.constant.Constants;
	15	import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
	16	import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
	17	import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
	18	import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
	19	import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
	20	import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
5b755f	21	import com.jcdm.main.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp;
C	22	import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
8c5c9c	23	import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
0ca254	24	import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
8c5c9c	25	import com.jcdm.main.plcserver.util.TimeUtil;
ef58b9	26	import com.jcdm.main.restful.factoryMes.service.RestfulService;
0ca254	27	import com.jcdm.main.restful.qingYan.doman.ChildVO;
A	28	import com.jcdm.main.restful.qingYan.doman.ParentVO;
	29	import com.kangaroohy.milo.model.ReadWriteEntity;
	30	import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
	31	import com.kangaroohy.milo.service.MiloService;
	32	import lombok.extern.slf4j.Slf4j;
109e2f	33	import org.springframework.beans.factory.annotation.Value;
0ca254	34	import org.springframework.stereotype.Component;
ef58b9	35	import org.springframework.web.bind.annotation.GetMapping;
0ca254	36
A	37	import javax.websocket.Session;
	38	import java.text.SimpleDateFormat;
	39	import java.util.*;
109e2f	40	import java.util.concurrent.CompletableFuture;
0ca254	41	import java.util.stream.Collectors;
109e2f	42
0ca254	43
A	44	@Slf4j
	45	@Component
	46	public class OPCUaSubscription implements SubscriptionCallback {
	47
8c5c9c	48	public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
0ca254	49
A	50
8c5c9c	51	Map<String, Session> map = WebSocketUsers.getUsers();
0ca254	52	public static MiloService miloService;
A	53
	54
109e2f	55	public static IDaPassingStationCollectionService daPassingStationCollectionService;
0ca254	56
A	57	public static IDaCollectionParamConfService collectionParamConfService;
	58
	59	public static IDaParamCollectionService daParamCollectionService;
	60
	61	public static IOmProductionOrdeInfoService omProductionOrdeInfoService;
	62
5b755f	63	public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
C	64
0d7433	65	/* @Value("${orderLineUrl}")
C	66	private static String orderLineUrl;*/
0ca254	67
A	68	public OPCUaSubscription(MiloService miloService,
	69	IDaPassingStationCollectionService daPassingStationCollectionService,
	70	IDaCollectionParamConfService collectionParamConfService,
	71	IDaParamCollectionService daParamCollectionService,
5b755f	72	IOmProductionOrdeInfoService omProductionOrdeInfoService,
C	73	IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService) {
0ca254	74	OPCUaSubscription.miloService = miloService;
109e2f	75	OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService;
0ca254	76	OPCUaSubscription.collectionParamConfService = collectionParamConfService;
A	77	OPCUaSubscription.daParamCollectionService = daParamCollectionService;
	78	OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
5b755f	79	OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService;
0ca254	80	}
A	81
	82
	83	@Override
	84	public void onSubscribe(String identifier, Object value) {
109e2f	85	log.info("地址："+identifier+"值："+value);
0ca254	86	try {
109e2f	87	if(null != value && !Constants.ZERO.equals(value.toString())) {
0ca254	88	String[] nodes = identifier.split("[.]");
A	89	String thoroughfare = nodes[0];//通道
	90	String device = nodes[1];//设备
	91	String tab = nodes[2];//标记
109e2f	92	String valueString = value.toString();//地址值
e4f9cb	93
C	94	CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
	95	subHandle(thoroughfare,device,tab,valueString);
	96	});
	97
	98	}
	99	} catch (Exception e) {
	100	log.error(e.getMessage());
	101	}
	102	}
	103
	104	public void subHandle(String thoroughfare,String device,String tab,String valueString){
	105	try{
	106	if (Constants.RECORD_CHECK_CODE.equals(tab)){//电芯校验
	107	if (Constants.ONE.equals(valueString)){
	108	Integer scanResult = 11;
	109	if (Constants.OP010.equals(device)){
	110	//OP010工位电芯条码校验\|\|OP030工位电芯条码校验
	111	Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
	112	if (ObjectUtil.isNotNull(value1)){
	113	String keyCode = value1.toString();
	114	log.info("读取到工位{}的Scaner数据：{}",device,keyCode);
	115	//仅校验长度是否合格
109e2f	116	// List<KeyCodeCheck> collect = keyCodeCheckService.list().stream().filter(x -> x.getKeyCode().contains(keyCode)).collect(Collectors.toList());
C	117	// if (CollUtil.isNotEmpty(collect)){
	118	// scanResult = 11;
0ca254	119	// }
e4f9cb	120	}
C	121	}else if(Constants.OP030.equals(device)){
	122	Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
	123	if (ObjectUtil.isNotNull(value1)){
	124	String cellCode = value1.toString();
	125	//反馈电芯ocv检测结果
997e69	126	boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验
e4f9cb	127	//四个电芯的状态
C	128	if (b){
	129	scanResult = 11;
ec7e2a	130	}else {
C	131	scanResult = 12;
	132	}
e4f9cb	133	}else {
C	134	scanResult = 12;
0ca254	135	}
A	136	}
e4f9cb	137	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
C	138	log.info("写入到工位{}的ScanerResult1数据：{}",device,scanResult);
	139	}
	140	}else if (Constants.RECORD_SN.equals(tab)){//求下发模组码请9
	141	if (Constants.ONE.equals(valueString)){
	142	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());//没有要生产的工单
	143	}
	144	}else if (Constants.RECORD_DATA.equals(tab)){//出入站
	145	if (Constants.ONE.equals(valueString)){//入站
	146	//1:告知MES托盘已到站，请求下发进站状态
	147	if (Constants.OP030.equals(device)){
	148	//反馈电芯ocv检测结果
997e69	149	boolean b = OCVResultFeedBack(thoroughfare, device);//进站对4个电芯校验
e4f9cb	150	//四个电芯的状态
C	151	if (b){
109e2f	152	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
C	153	log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
e4f9cb	154	}else {
C	155	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
	156	log.info("写入到工位{}的RecordDataDone数据：{}",device,12);
109e2f	157	}
e4f9cb	158	} else if(Constants.OP100_1.equals(device) \|\| Constants.OP100_2.equals(device)){
C	159	//1、进站PLC给产品类型，MES读取产品类型
	160	Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
	161	if (ObjectUtil.isNotNull(productTypeObjcet)){
	162	String productType = productTypeObjcet.toString();//产品类型
35c489	163	String materialCode = Constants.materialMap.get(productType);
e4f9cb	164	CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
C	165	//调用工厂MES，保存到数据库,并且将工单传给PLC (目前临时用该方法）
35c489	166	receivingWorkOrders(thoroughfare, device,materialCode);
e4f9cb	167	});
C	168
	169	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
	170	log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
	171	}else{
	172	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
	173	}
	174
	175	}else if (Constants.ModuleList.contains(device)){//有模组码的工位
	176	Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
	177	if (ObjectUtil.isNull(modulCodeObjcet)){
	178	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
	179	}else{
	180	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
0ca254	181	}
109e2f	182	}
e4f9cb	183	else {
C	184	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
	185	log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
0ca254	186	}
e4f9cb	187	}else if (Constants.TWO.equals(valueString)){//出站
C	188	//分段010-065段
	189	if (Constants.OP010.equals(device)){
	190	//010工位无过站记录，只给放行信号
	191	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
	192	log.info("写入到工位{}的RecordDataDone数据：{}",device,21);
	193	}else if (Constants.OP020_OP090.contains(device)){
	194	Integer result = 21;
	195	//读取电芯码
	196	List<String> cellCodeList = readCellCodeList(thoroughfare, device);
	197	if(ObjectUtil.isNull(cellCodeList) \|\| cellCodeList.size() != 4){
	198	result = 23;
	199	}else{
	200	result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站
	201	if(result == 21) {
069a9b	202	result = saveParamCollection(device,cellCodeList);//保存参数，发送工厂MES
e4f9cb	203	}
C	204	}
	205	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
	206	log.info("写入到工位{}的RecordDataDone数据：{}",device,result);
	207	} else if (Constants.OP100_OP150.contains(device)){//人工工位
	208	WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
	209	} else {
	210	Integer result = 21;
13a2a4	211	//Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
e4f9cb	212	Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
C	213	if (ObjectUtil.isNull(modulCodeObjcet)){
	214	result = 23;
	215	}else{
	216	String moduleCode = modulCodeObjcet.toString();
069a9b	217	Object stationStatusObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();//站状态地址
C	218	if (ObjectUtil.isNotNull(stationStatusObjcet)){
	219	String stationStatus = stationStatusObjcet.toString();
	220	result = savePassingStation(thoroughfare, device,moduleCode,stationStatus);//保存过站
	221	if(result == 21) {
	222	result = saveParamCollection(device,moduleCode,stationStatus);//保存参数，发送工厂MES
	223	}
	224	}else{
	225	result = 23;
	226	log.info("读取到工位{}StationStatus数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
e4f9cb	227	}
069a9b	228
e4f9cb	229	}
C	230	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
	231	log.info("写入到工位{}的RecordDataDone数据：{}",device,result);
	232	}
	233	}
0ca254	234	}
e4f9cb	235	}catch (Exception e) {
8c5c9c	236	log.error(e.getMessage());
0ca254	237	}
A	238	}
35c489	239	/* public void receivingWorkOrders(String thoroughfare ,String device) {
4878fe	240	String paramProductNum = "";
C	241	try {
	242
	243	List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
	244	.eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//工单状态
	245
	246	if (CollUtil.isNotEmpty(orderList)){
	247	Long id = orderList.get(0).getId();
	248	String productNum = orderList.get(0).getProductNum();//模组码
8e3998	249	String orderNum = orderList.get(0).getWorkOrderNo();
4878fe	250	//下发产品模组码
e0c9c6	251	miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
9fbf09	252	miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
4878fe	253	//miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());
C	254
	255	//更新工单状态为执行中
	256	OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
	257	omProductionOrdeInfo.setId(id);
	258	omProductionOrdeInfo.setOrderStatus("3");
	259	omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo);
	260
	261	//将产品SN发送到前台
	262	productNum = "productNum,"+ productNum;
	263	WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
35c489	264	}//else{
4878fe	265	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//没有要生产的工单
35c489	266	}//
4878fe	267	} catch (Exception e) {
C	268	throw new RuntimeException(e);
	269	}
35c489	270	}*/
4878fe	271
35c489	272	public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
ef58b9	273	{
C	274	String paramProductNum = "";
	275	try {
	276	// 查询最新的工单信息
22c9e0	277	OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
069a9b	278
C	279	log.info("请求工厂MES工单：入参device{},materialCode：{}", device, materialCode);
35c489	280	String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
ef58b9	281	JSONObject jsonObject = new JSONObject(orderJsonString);
C	282	// 从JSONObject中获取data对象
	283	JSONObject dataObject = jsonObject.getJSONObject("data");
	284	String code = jsonObject.getStr("code");
	285	// 判断接单是否成功
	286	if(code.equals("success")) {
	287	log.info("请求工厂MES工单：入参pack{}出参pack：{}", paramProductNum, dataObject.getStr("productNum"));
	288	OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
	289	omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
	290	omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
	291	omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
	292	omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
653b17	293	omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
ef58b9	294	omProductionOrdeInfo.setOnlineCompletionMark("0");
C	295	omProductionOrdeInfo.setSfResult("0");
	296	omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
	297	omProductionOrdeInfo.setCreateTime(new Date());
	298	omProductionOrdeInfo.setCreateUser("工厂MES");
	299	omProductionOrdeInfoService.save(omProductionOrdeInfo);
	300
	301	//发送给前台
	302	WebSocketUsers.sendMessageToUserByText(map.get(device), dataObject.getStr("productNum"));
	303
	304	//写PLC
ab6314	305	miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(dataObject.getStr("productNum")).build());
C	306	miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());
ef58b9	307
C	308	}
	309	} catch (Exception e) {
	310	throw new RuntimeException(e);
	311	}
35c489	312	}
0ca254	313
A	314	/**
109e2f	315	* 读取电芯码
C	316	* @param thoroughfare 通道
	317	* @param device 工位
	318	* @return list
	319	* @throws Exception e
0ca254	320	*/
109e2f	321	private static List<String> readCellCodeList(String thoroughfare, String device){
C	322	List<String> cellCodeList = new ArrayList<>();
2de856	323	Map map = new HashMap();
109e2f	324	//电芯码地址
C	325	List<String> readList = new ArrayList<>();
	326	readList.add(thoroughfare + "." + device +".CellCode_1");
	327	readList.add(thoroughfare + "." + device +".CellCode_2");
	328	readList.add(thoroughfare + "." + device +".CellCode_3");
	329	readList.add(thoroughfare + "." + device +".CellCode_4");
0ca254	330	try {
109e2f	331	List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);//电芯码
C	332	for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
2de856	333	if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){
C	334	cellCodeList.add(readWriteEntity.getValue().toString());//封装电芯码
18b39c	335	}/*else{
2de856	336	cellCodeList.add("");//封装电芯码
18b39c	337	}*/
0ca254	338	}
2de856	339
0ca254	340	} catch (Exception e) {
A	341	throw new RuntimeException(e);
	342	}
109e2f	343	return cellCodeList;
2de856	344	}
C	345
	346
	347	/**
	348	* 保存过站数据
	349	* @param thoroughfare 通道
	350	* @param device 工位
	351	* @param moduleCode 模组号
069a9b	352	* @param stationStatus 站状态
2de856	353	* @return list
C	354	* @throws Exception e
	355	*/
069a9b	356	private static Integer savePassingStation(String thoroughfare, String device,String moduleCode,String stationStatus){
2de856	357	Integer result = 21;
C	358
	359	try {
	360	//读进站时间
	361	Date startTime = new Date();
	362	ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间
	363	if (ObjectUtil.isNotNull(startTimeRead.getValue())){
	364	startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
	365	}else{
	366	result = 23;
	367	log.info("读取到工位{}的StartTime数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
	368	return result;
	369	}
	370
	371	DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
	372	passingStationCollection.setSfcCode(moduleCode);//电芯码
	373	passingStationCollection.setLocationCode(device);//工位
	374	passingStationCollection.setInboundTime(startTime);//进站时间
	375	passingStationCollection.setOutboundTime(new Date());//出站时间
	376	passingStationCollection.setOutRsSign(stationStatus);//站状态值
	377	passingStationCollection.setCollectionTime(new Date());//采集时间
	378	daPassingStationCollectionService.save(passingStationCollection);
	379
	380	} catch (Exception e) {
	381	throw new RuntimeException(e);
	382	}
	383
	384	return result;
0ca254	385	}
A	386
109e2f	387	/**
C	388	* 保存过站数据
	389	* @param thoroughfare 通道
	390	* @param device 工位
	391	* @param cellCodeList 电芯码集合
	392	* @return list
	393	* @throws Exception e
	394	*/
	395	private static Integer savePassingStation(String thoroughfare, String device,List<String> cellCodeList){
	396	Integer result = 21;
	397
	398	try {
	399	//读进站时间
	400	Date startTime = new Date();
	401	ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间
	402	if (ObjectUtil.isNotNull(startTimeRead.getValue())){
8c5c9c	403	startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
109e2f	404	}else{
C	405	result = 23;
	406	log.info("读取到工位{}的StartTime数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
2de856	407	return result;
109e2f	408	}
C	409
	410	//读工站状态
	411	String stationStatus = Constants.PASS;
	412	ReadWriteEntity stationStatusRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus");//站状态地址
	413	if (ObjectUtil.isNotNull(stationStatusRead.getValue())){
	414	String string = stationStatusRead.getValue().toString();
	415	if (Constants.TWO.equals(string)){
	416	stationStatus = Constants.UN_PASS;
	417	}
	418	}else{
	419	result = 23;
2de856	420	log.info("读取到工位{}StationStatus数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
C	421	return result;
109e2f	422	}
C	423
	424	List<DaPassingStationCollection> passingList = new ArrayList<>();
	425	for (String cellCode : cellCodeList) {
	426	DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
2de856	427	if (ObjectUtil.isNotNull(cellCode) && !cellCode.isEmpty()){
109e2f	428	passingStationCollection.setSfcCode(cellCode);//电芯码
C	429	passingStationCollection.setLocationCode(device);//工位
	430	passingStationCollection.setInboundTime(startTime);//进站时间
	431	passingStationCollection.setOutboundTime(new Date());//出站时间
	432	passingStationCollection.setOutRsSign(stationStatus);//站状态值
	433	passingStationCollection.setCollectionTime(new Date());//采集时间
	434	passingList.add(passingStationCollection);
	435	}
	436	}
	437
	438	if (CollUtil.isNotEmpty(passingList)){
	439	daPassingStationCollectionService.insertBatch(passingList);//存储过站采集数据
	440	}
	441
	442	} catch (Exception e) {
	443	throw new RuntimeException(e);
	444	}
	445
	446	return result;
	447	}
	448
2de856	449
109e2f	450	/**
2de856	451	* 保存参数数据和发送工厂MES
C	452	* @param device 工位
	453	* @param moduleCode 模组号
069a9b	454	* @param stationStatus 站状态
2de856	455	* @return list
C	456	* @throws Exception e
	457	*/
069a9b	458	private static Integer saveParamCollection(String device,String moduleCode,String stationStatus){
2de856	459	Integer result = 21;//返回结果
5c62de	460	String sendMes = "";
2de856	461
C	462	try {
	463	//查询参数配置表
	464	List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
	465	.eq(DaCollectionParamConf::getProcessesCode, device)//工位
	466	.eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集
	467	);
	468	if (CollUtil.isNotEmpty(list)){
	469
	470	List<String> collect = list.stream()
	471	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	472	List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect);
	473
	474	List<DaParamCollection> collectionList = new ArrayList<>();
	475	List<ChildVO> mesList = new ArrayList<>();
	476	for (int i = 0; i < readWriteEntityList.size(); i++) {
	477	DaParamCollection daParamCollection = new DaParamCollection();
	478	daParamCollection.setSfcCode(moduleCode);//模组码
	479	daParamCollection.setParamCode(list.get(i).getCollectParameterId());//参数编码
	480	daParamCollection.setParamName(list.get(i).getCollectParameterName());//参数名称
	481	String paramValue = "";
	482	if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){
	483	paramValue = readWriteEntityList.get(i).getValue().toString();//参数值
e0c9c6	484	if("DATE".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
C	485	paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
	486	}
2de856	487	}
C	488	daParamCollection.setParamValue(paramValue);//参数值
	489	daParamCollection.setLocationCode(device);//工位
	490	daParamCollection.setCollectionTime(new Date());//采集时间
	491	collectionList.add(daParamCollection);//封装参数采集list
	492
	493	//发送给工厂mes参数封装
	494	ChildVO childVO = new ChildVO();
	495	childVO.setItemCode(list.get(i).getCollectParameterId());//参数编码
	496	childVO.setItemType(list.get(i).getItemType());
	497	childVO.setItemValue(paramValue);//参数值
	498	childVO.setItemText(list.get(i).getCollectParameterName());
	499	childVO.setCheckResult("1");
e0c9c6	500	childVO.setCheckTime(format.format(new Date()));
2de856	501	mesList.add(childVO);
C	502	}
	503
	504	CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
	505	//插入参数采集表
	506	daParamCollectionService.insertBatch(collectionList);
997e69	507
C	508	//如果220工位，进行报工
	509	if("M1OP220".equals(device)) {
	510	RestfulService.getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
	511	}
	512
2de856	513	//上传到工厂mes
C	514	ParentVO parentVO = new ParentVO();
	515	parentVO.setStationCode(device);//工位
	516	parentVO.setSiteCode("3983");
	517
	518	parentVO.setRecordId(UUID.randomUUID().toString());
997e69	519	if("2".equals(stationStatus)){//工站状态
069a9b	520	parentVO.setTotalResult("0");
C	521	}else {
	522	parentVO.setTotalResult("1");
	523	}
2de856	524	parentVO.setProductNum(moduleCode);
C	525	parentVO.setCheckList(mesList);
	526
e4f9cb	527	log.info("执行工厂MES方法start，工位号{} 传入数据：{}",device ,parentVO);
971788	528	HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
e4f9cb	529	log.info("执行工厂MES方法end，工位号{} 返回数据：{}",device,execute.body());
2de856	530
C	531	});
	532	}
	533	}catch (Exception e) {
	534	throw new RuntimeException(e);
	535	}
	536	return result;
	537	}
	538
	539	/**
	540	* 保存参数数据和发送工厂MES
109e2f	541	* @param device 工位
C	542	* @param cellCodeList 电芯码集合
	543	* @return list
	544	* @throws Exception e
	545	*/
069a9b	546	private static Integer saveParamCollection(String device,List<String> cellCodeList){
109e2f	547	Integer result = 21;//返回结果
743e2e	548	List<ChildVO> mesChildList1 = new ArrayList<>();//封装给工厂MES发送的childlist1
C	549	List<ChildVO> mesChildList2 = new ArrayList<>();//封装给工厂MES发送的childlist2
	550	List<ChildVO> mesChildList3 = new ArrayList<>();//封装给工厂MES发送的childlist3
	551	List<ChildVO> mesChildList4 = new ArrayList<>();//封装给工厂MES发送的childlist4
	552	List<ChildVO> mesChildList0 = new ArrayList<>();//封装给工厂MES发送的childlist4
109e2f	553	try {
C	554	//查询参数配置表
	555	List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
	556	.eq(DaCollectionParamConf::getProcessesCode, device)//工位
8c5c9c	557	.eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集
2de856	558	);//类型
109e2f	559	if (CollUtil.isNotEmpty(list)) {
C	560	List<DaParamCollection> saveParamList = new ArrayList<>();//封装参数采集list
	561	List<DaCollectionParamConf> confColl1 = list.stream().filter(x -> Constants.INT_ONE.equals(x.getKeyNum())).collect(Collectors.toList());
	562	List<DaCollectionParamConf> confColl2 = list.stream().filter(x -> Constants.INT_TWO.equals(x.getKeyNum())).collect(Collectors.toList());
	563	List<DaCollectionParamConf> confColl3 = list.stream().filter(x -> Constants.INT_THREE.equals(x.getKeyNum())).collect(Collectors.toList());
	564	List<DaCollectionParamConf> confColl4 = list.stream().filter(x -> Constants.INT_FOUR.equals(x.getKeyNum())).collect(Collectors.toList());
	565	List<DaCollectionParamConf> confColl0 = list.stream().filter(x -> Constants.INT_ZERO.equals(x.getKeyNum())).collect(Collectors.toList());
	566
	567	List<String> collect1 = confColl1.stream()
	568	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	569	List<ReadWriteEntity> paramCollectionList1 = miloService.readFromOpcUa(collect1);//电芯1 参数值
	570
	571	List<String> collect2 = confColl2.stream()
	572	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	573	List<ReadWriteEntity> paramCollectionList2 = miloService.readFromOpcUa(collect2);//电芯2 参数值
	574
	575	List<String> collect3 = confColl3.stream()
	576	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	577	List<ReadWriteEntity> paramCollectionList3 = miloService.readFromOpcUa(collect3);//电芯3 参数值
	578
	579	List<String> collect4 = confColl4.stream()
	580	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	581	List<ReadWriteEntity> paramCollectionList4 = miloService.readFromOpcUa(collect4);//电芯4 参数值
	582
	583	List<String> collect0 = confColl0.stream()
	584	.map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
	585	List<ReadWriteEntity> paramCollectionList0 = miloService.readFromOpcUa(collect0);//电芯参数值
	586
	587	//第一个电芯的数据
2de856	588	if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) {
109e2f	589	for (int i = 0; i < paramCollectionList1.size(); i++) {
C	590	DaParamCollection daParamCollection = new DaParamCollection();
	591	daParamCollection.setSfcCode(cellCodeList.get(0));//电芯码
	592	daParamCollection.setParamCode(confColl1.get(i).getCollectParameterId());//参数编码
	593	daParamCollection.setParamName(confColl1.get(i).getCollectParameterName());//参数名称
	594	String paramValue = "";
	595	if (ObjectUtil.isNotNull(paramCollectionList1.get(i).getValue())) {
	596	paramValue = paramCollectionList1.get(i).getValue().toString();//参数值
	597	}
	598	daParamCollection.setParamValue(paramValue);//参数值
	599	daParamCollection.setLocationCode(device);//工位
	600	daParamCollection.setCollectionTime(new Date());//采集时间
	601	saveParamList.add(daParamCollection);//封装参数采集list
	602
	603	//发送给工厂mes参数封装
	604	ChildVO childVO = new ChildVO();
e4f9cb	605	childVO.setItemCode(confColl1.get(i).getCollectParameterId());//参数
109e2f	606	childVO.setItemType(confColl1.get(i).getItemType());
C	607	childVO.setItemValue(paramValue);//参数值
e4f9cb	608	childVO.setItemText(confColl1.get(i).getCollectParameterName());
109e2f	609	childVO.setCheckResult("1");
e0c9c6	610	childVO.setCheckTime(format.format(new Date()));
109e2f	611	mesChildList1.add(childVO);
C	612	}
743e2e	613
109e2f	614	}
2de856	615	if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) {
109e2f	616
C	617	for (int i = 0; i < paramCollectionList2.size(); i++) {
	618	DaParamCollection daParamCollection = new DaParamCollection();
	619	daParamCollection.setSfcCode(cellCodeList.get(1));//电芯码
	620	daParamCollection.setParamCode(confColl2.get(i).getCollectParameterId());//参数编码
	621	daParamCollection.setParamName(confColl2.get(i).getCollectParameterName());//参数名称
	622	String paramValue = "";
	623	if (ObjectUtil.isNotNull(paramCollectionList2.get(i).getValue())) {
	624	paramValue = paramCollectionList2.get(i).getValue().toString();//参数值
	625	}
	626	daParamCollection.setParamValue(paramValue);//参数值
	627	daParamCollection.setLocationCode(device);//工位
	628	daParamCollection.setCollectionTime(new Date());//采集时间
	629	saveParamList.add(daParamCollection);//封装参数采集list
	630
	631	//发送给工厂mes参数封装
	632	ChildVO childVO = new ChildVO();
e4f9cb	633	childVO.setItemCode(confColl2.get(i).getCollectParameterId());//参数
109e2f	634	childVO.setItemType(confColl2.get(i).getItemType());
C	635	childVO.setItemValue(paramValue);//参数值
e4f9cb	636	childVO.setItemText(confColl2.get(i).getCollectParameterName());
109e2f	637	childVO.setCheckResult("1");
e0c9c6	638	childVO.setCheckTime(format.format(new Date()));
109e2f	639	mesChildList2.add(childVO);
C	640	}
	641	}
2de856	642	if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) {
109e2f	643	for (int i = 0; i < paramCollectionList3.size(); i++) {
C	644	DaParamCollection daParamCollection = new DaParamCollection();
	645	daParamCollection.setSfcCode(cellCodeList.get(2));//电芯码
	646	daParamCollection.setParamCode(confColl3.get(i).getCollectParameterId());//参数编码
	647	daParamCollection.setParamName(confColl3.get(i).getCollectParameterName());//参数名称
	648	String paramValue = "";
	649	if (ObjectUtil.isNotNull(paramCollectionList3.get(i).getValue())) {
	650	paramValue = paramCollectionList3.get(i).getValue().toString();//参数值
	651	}
	652	daParamCollection.setParamValue(paramValue);//参数值
	653	daParamCollection.setLocationCode(device);//工位
	654	daParamCollection.setCollectionTime(new Date());//采集时间
	655	saveParamList.add(daParamCollection);//封装参数采集list
	656
	657	//发送给工厂mes参数封装
	658	ChildVO childVO = new ChildVO();
e4f9cb	659	childVO.setItemCode(confColl3.get(i).getCollectParameterId());//参数
109e2f	660	childVO.setItemType(confColl3.get(i).getItemType());
C	661	childVO.setItemValue(paramValue);//参数值
e4f9cb	662	childVO.setItemText(confColl3.get(i).getCollectParameterName());
109e2f	663	childVO.setCheckResult("1");
e0c9c6	664	childVO.setCheckTime(format.format(new Date()));
109e2f	665	mesChildList3.add(childVO);
C	666	}
	667	}
2de856	668	if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) {
109e2f	669	for (int i = 0; i < paramCollectionList4.size(); i++) {
C	670	DaParamCollection daParamCollection = new DaParamCollection();
	671	daParamCollection.setSfcCode(cellCodeList.get(3));//电芯码
	672	daParamCollection.setParamCode(confColl4.get(i).getCollectParameterId());//参数编码
	673	daParamCollection.setParamName(confColl4.get(i).getCollectParameterName());//参数名称
	674	String paramValue = "";
	675	if (ObjectUtil.isNotNull(paramCollectionList4.get(i).getValue())) {
	676	paramValue = paramCollectionList4.get(i).getValue().toString();//参数值
	677	}
	678	daParamCollection.setParamValue(paramValue);//参数值
	679	daParamCollection.setLocationCode(device);//工位
	680	daParamCollection.setCollectionTime(new Date());//采集时间
	681	saveParamList.add(daParamCollection);//封装参数采集list
	682
	683	//发送给工厂mes参数封装
	684	ChildVO childVO = new ChildVO();
e4f9cb	685	childVO.setItemCode(confColl4.get(i).getCollectParameterId());//参数
109e2f	686	childVO.setItemType(confColl4.get(i).getItemType());
C	687	childVO.setItemValue(paramValue);//参数值
e4f9cb	688	childVO.setItemText(confColl4.get(i).getCollectParameterName());
109e2f	689	childVO.setCheckResult("1");
e0c9c6	690	childVO.setCheckTime(format.format(new Date()));
109e2f	691	mesChildList4.add(childVO);
C	692	}
	693	}
	694
	695	//公共参数
	696	if (CollUtil.isNotEmpty(paramCollectionList0)) {
	697	for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯
2de856	698	if(!cellCodeList.get(i).isEmpty()){
C	699	for (int j = 0; j < paramCollectionList0.size(); j++) {
	700	DaParamCollection daParamCollection = new DaParamCollection();
	701	daParamCollection.setSfcCode(cellCodeList.get(i));//电芯码
	702	daParamCollection.setParamCode(confColl0.get(j).getCollectParameterId());//参数编码
	703	daParamCollection.setParamName(confColl0.get(j).getCollectParameterName());//参数名称
	704	String paramValue = "";
	705	if (ObjectUtil.isNotNull(paramCollectionList0.get(j).getValue())) {
	706	paramValue = paramCollectionList0.get(j).getValue().toString();//参数值
e0c9c6	707	if("DATE".equals(confColl0.get(j).getCollectParameterType()) && !paramValue.isEmpty()){
C	708	paramValue = TimeUtil.test(TimeUtil.stringProcessing(paramValue));
	709	}
2de856	710	}
C	711	daParamCollection.setParamValue(paramValue);//参数值
	712	daParamCollection.setLocationCode(device);//工位
	713	daParamCollection.setCollectionTime(new Date());//采集时间
	714	saveParamList.add(daParamCollection);
109e2f	715
2de856	716	//发送给工厂mes参数封装
C	717	ChildVO childVO = new ChildVO();
e4f9cb	718	childVO.setItemCode(confColl0.get(j).getCollectParameterId());//参数
2de856	719	childVO.setItemType(confColl0.get(j).getItemType());
C	720	childVO.setItemValue(paramValue);//参数值
e4f9cb	721	childVO.setItemText(confColl0.get(j).getCollectParameterName());
2de856	722	childVO.setCheckResult("1");
e0c9c6	723	childVO.setCheckTime(format.format(new Date()));
2de856	724	mesChildList0.add(childVO);
C	725	}
109e2f	726	}
2de856	727
C	728	//mesList.get(i).addAll(mesChildList0);
	729
109e2f	730	}
C	731
	732	}
	733
	734	CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
	735	//插入参数采集表
	736	daParamCollectionService.insertBatch(saveParamList);
	737	//上传到工厂mes
	738	ParentVO parentVO = new ParentVO();
	739	parentVO.setStationCode(device);//工位
	740	parentVO.setSiteCode("3983");
	741
	742	parentVO.setRecordId(UUID.randomUUID().toString());
	743	parentVO.setTotalResult("1");
	744	for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯
2de856	745	if(!cellCodeList.get(i).isEmpty()){
C	746	parentVO.setProductNum(cellCodeList.get(i));//电芯码
743e2e	747	//封装给工厂MES发送的childlist4
C	748	List<ChildVO> mesChildList = new ArrayList<>(mesChildList0);
	749	switch (i) {
	750	case 0 :
	751	mesChildList.addAll(mesChildList1);
	752	break;
	753	case 1 :
	754	mesChildList.addAll(mesChildList2);
	755	break;
	756	case 2 :
	757	mesChildList.addAll(mesChildList3);
	758	break;
	759	case 3 :
	760	mesChildList.addAll(mesChildList4);
	761	break;
	762
	763	}
	764	parentVO.setCheckList(mesChildList);//参数
2de856	765	//CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
C	766	log.info("执行工厂MES方法start，传入数据：{}",parentVO);
971788	767	HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
2de856	768	log.info("执行工厂MES方法end，返回数据：{}",execute.body());
C	769	}
109e2f	770	}
C	771	});
	772	}
	773	}catch (Exception e) {
743e2e	774	log.error(e.getMessage());
109e2f	775	throw new RuntimeException(e);
C	776	}
	777	return result;
	778	}
	779
	780	/**
2de856	781	* 030工位返回ocv测试结果
C	782	* @param thoroughfare
	783	* @param device
ec7e2a	784	* @param cellCode
C	785	* @throws Exception
	786	*/
	787	private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
	788	boolean flag = true;
	789
	790	List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
	791	.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
	792	.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
	793	if (CollUtil.isNotEmpty(list)){
d8e6a5	794	DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
ec7e2a	795	if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
C	796	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
	797	}else {
	798	flag = false;
	799	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
	800	}
d8e6a5	801	daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
f18ebf	802	}else {
C	803	flag = false;
	804	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
	805	log.info("读取到工位{},测试设备返回的数据查询不到，电芯码为：{}",device,cellCode);
ec7e2a	806	}
C	807	return flag;
	808	}
	809	/**
	810	* 030工位返回ocv测试结果
	811	* @param thoroughfare
	812	* @param device
109e2f	813	* @throws Exception
C	814	*/
2de856	815	private boolean OCVResultFeedBack(String thoroughfare, String device) throws Exception {
C	816	boolean flag = true;
	817	Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_1").getValue();
5b755f	818	if (ObjectUtil.isNotNull(value1)){
C	819	String cellCode = value1.toString();
	820	List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
	821	.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
	822	.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
2de856	823	if (CollUtil.isNotEmpty(list)){
18b39c	824	DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
5b755f	825	if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
2de856	826	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
C	827	}else {
	828	flag = false;
	829	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
	830	}
18b39c	831	daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
2de856	832	}
f18ebf	833	}else {
C	834	flag = false;
	835	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
	836	log.info("读取到工位{},PLC没有给电芯码",device);
5b755f	837	}
2de856	838	Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue();
5b755f	839	if (ObjectUtil.isNotNull(value2)){
C	840	String cellCode = value2.toString();
	841	List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
	842	.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
	843	.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
2de856	844	if (CollUtil.isNotEmpty(list)){
18b39c	845	DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
5b755f	846	if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
2de856	847	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(1).build());
C	848	}else {
	849	flag = false;
	850	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build());
	851	}
18b39c	852	daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
2de856	853	}
f18ebf	854	}else {
C	855	flag = false;
	856	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build());
	857	log.info("读取到工位{},PLC没有给电芯码",device);
5b755f	858	}
C	859
2de856	860	Object value3 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_3").getValue();
5b755f	861	if (ObjectUtil.isNotNull(value3)){
C	862	String cellCode = value3.toString();
	863	List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
	864	.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
	865	.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
2de856	866	if (CollUtil.isNotEmpty(list)){
18b39c	867	DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
5b755f	868	if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
2de856	869	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(1).build());
C	870	}else {
	871	flag = false;
	872	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build());
	873	}
18b39c	874	daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
2de856	875	}
f18ebf	876	}else {
C	877	flag = false;
	878	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build());
	879	log.info("读取到工位{},PLC没有给电芯码",device);
5b755f	880	}
C	881
2de856	882	Object value4 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_4").getValue();
5b755f	883	if (ObjectUtil.isNotNull(value4)){
C	884	String cellCode = value4.toString();
	885	List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
	886	.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
	887	.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
2de856	888	if (CollUtil.isNotEmpty(list)){
18b39c	889	DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
5b755f	890	if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
2de856	891	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(1).build());
C	892	}else {
	893	flag = false;
	894	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build());
	895	}
18b39c	896	daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
2de856	897	}
f18ebf	898	}else {
C	899	flag = false;
	900	miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build());
	901	log.info("读取到工位{},PLC没有给电芯码",device);
5b755f	902	}
C	903
2de856	904	return flag;
109e2f	905	}
C	906
997e69	907	/**
C	908	* AMES报工结果回传
	909	* @param productNum
	910	* @param stationCode
	911	* @param confirmTime
	912	* @return
	913	*/
	914	//{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","resultCode":"S","resultText":"报工成功"},"message":"API调用成功"}
	915	public static String getWorkReportResultFeedback(String productNum,String stationCode,String confirmTime)
	916	{
	917	String result = "";
	918	try {
	919	String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
	920	HttpResponse response = HttpRequest.get(url).execute();
	921	HttpRequest httpRequest = HttpRequest.get(url);
	922	result = response.body();
	923	}catch (Exception e){
	924	e.printStackTrace();
	925	}finally {
	926	return result;
	927	}
	928
	929	}
	930
109e2f	931
0ca254	932	}