| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/StandingHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -93,6 +93,9 @@ @Value("${mes.startUpTestPACK}") private String suspendTestPACK; @Value("${mes.inPath}") private String inpath; @Override @@ -638,6 +641,14 @@ } locMast.setPackStatus(1); locMast.setModiTime(now); CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); combParam.setLocno(locMast.getLocNo()); combParam.setPackSts(1); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){ throw new CoolException("申请测试失败"); } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,7 @@ package com.zy.asrs.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.BaseRes; @@ -13,26 +15,29 @@ import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.mapper.TagMapper; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.utils.MatUtils; import com.zy.common.constant.MesConstant; import com.zy.common.model.DetlDto; import com.zy.common.utils.HttpHandler; import com.zy.common.utils.NodeUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.*; /** * Created by vincent on 2022/4/9 */ @Slf4j @Service public class OpenServiceImpl implements OpenService { public class OpenServiceImpl extends AbstractHandler<String> implements OpenService { @Autowired private OrderService orderService; @@ -60,6 +65,15 @@ private TestMastService testMastService; @Autowired private LocMastService locMastService; @Autowired private ApiLogService apiLogService; @Value("${mes.url}") private String mesUrl; @Value("${mes.inPath}") private String inpath; @Override @Transactional @@ -631,6 +645,12 @@ throw new CoolException("更新测试状态失败"); } locMast.setPackStatus(2); CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); combParam.setLocno(locMast.getLocNo()); combParam.setPackSts(2); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){ throw new CoolException("更新产品状态失败"); } @@ -670,6 +690,12 @@ } locMast.setPackStatus(3); testMast.setModiTime(date); CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); combParam.setLocno(locMast.getLocNo()); combParam.setPackSts(3); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){ throw new CoolException("更改产品状态失败"); } @@ -684,6 +710,54 @@ return success; } private ReturnT<String> postMesData(String mesPath, Object combParam){ if(combParam != null){ String response = ""; boolean success = false; try { Map<String, Object> map = new HashMap<>(); map.put("appkey","ea1f0459efc02a79f046f982767939ae"); response = new HttpHandler.Builder().setHeaders(map) .setUri(mesUrl) .setPath(mesPath) .setJson(JSON.toJSONString(combParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { if (jsonObject.getDate("isComplete").equals(true)){ success = true; }else if (jsonObject.getDate("isComplete").equals(false)){ success = false; }else { log.error("返回值出错!!!url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response); throw new CoolException("返回值出错"); } } else { log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response); throw new CoolException("上报mes系统失败"); } } catch (Exception e) { log.error("fail", e); // TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg(e.getMessage()); } finally { try { // 保存接口日志 apiLogService.save( "成品库入库上报", MesConstant.URL + MesConstant.PAKIN_URL, null, "127.0.0.1", JSON.toJSONString(combParam), response, success ); } catch (Exception e) { log.error("", e); } } } return SUCCESS; } /*...........................赣州新增..............以上.............赣州新增...........................*/ } src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -1,23 +1,32 @@ package com.zy.asrs.task.handler; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CombParam; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.common.constant.MesConstant; import com.zy.common.model.enums.WorkNoType; import com.zy.common.service.CommonService; import com.zy.common.utils.HttpHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; /** @@ -34,9 +43,17 @@ @Autowired private WrkMastService wrkMastService; @Autowired private ApiLogService apiLogService; @Autowired private CommonService commonService; @Autowired private WrkDetlService wrkDetlService; @Value("${mes.url}") private String mesUrl; @Value("${mes.inPath}") private String inpath; @Transactional public ReturnT<String> start() { @@ -99,6 +116,14 @@ locMast.setLocSts("R"); locMast.setModiTime(now); locMast.setPackStatus(5); //5:静置完成 CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); combParam.setLocno(locMast.getLocNo()); combParam.setPackSts(6); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); if (!locMastService.updateById(locMast)) { throw new CoolException("预约库位状态失败，库位号："+locMast.getLocNo()); } @@ -117,5 +142,44 @@ } return SUCCESS; } private ReturnT<String> postMesData(String mesPath,Object combParam){ if(combParam != null){ String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(mesUrl) .setPath(mesPath) .setJson(JSON.toJSONString(combParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { success = true; } else { log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response); throw new CoolException("上报mes系统失败"); } } catch (Exception e) { log.error("fail", e); // TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg(e.getMessage()); } finally { try { // 保存接口日志 apiLogService.save( "成品库入库上报", MesConstant.URL + MesConstant.PAKIN_URL, null, "127.0.0.1", JSON.toJSONString(combParam), response, success ); } catch (Exception e) { log.error("", e); } } } return SUCCESS; } } src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -69,7 +69,7 @@ combParam.setLocno(wrkMast.getLocNo()); combParam.setPackSts(1); combParam.setRequestTime(DateUtils.convert(new Date())); // result = postMesData(inpath,combParam); result = postMesData(inpath,combParam); // 保存入库通知档历史档 if (!waitPakinLogService.save(wrkMast.getBarcode())) { exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo()); @@ -87,7 +87,16 @@ combParam.setLocno(wrkMast.getLocNo()); combParam.setPackSts(0); combParam.setRequestTime(DateUtils.convert(new Date())); // result = postMesData(outPath,combParam); result = postMesData(outPath,combParam); } }else if(wrkMast.getWrkSts() == 4 && wrkMast.getIoType() == 11){ if(wrkDetl != null){ CombParam combParam = new CombParam(); combParam.setPackNo(wrkDetl.getZpallet()); combParam.setLocno(wrkMast.getLocNo()); combParam.setPackSts(5); combParam.setRequestTime(DateUtils.convert(new Date())); result = postMesData(inpath,combParam); } } if(null != result && !result.isSuccess()){
