src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/config/CoolExceptionHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/constant/MesConstant.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/model/MesCombParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.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.core.common.BaseRes; import com.core.common.Cools; @@ -11,8 +13,11 @@ import com.zy.asrs.entity.param.MobileAdjustParam; import com.zy.asrs.entity.param.OpenOrderPakinParam; import com.zy.asrs.service.*; import com.zy.common.constant.MesConstant; import com.zy.common.entity.Parameter; import com.zy.common.model.DetlDto; import com.zy.common.model.MesCombParam; import com.zy.common.utils.HttpHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -277,7 +282,36 @@ }); if (packDown) { // 数据上报 todo MesCombParam mesCombParam = new MesCombParam(); mesCombParam.setZpallet(param.getBarcode()); mesCombParam.setCombTime(DateUtils.convert(now)); mesCombParam.setLgort("5008"); for (DetlDto detlDto : detlDtos) { mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getMatnr(), detlDto.getAnfme())); } System.out.println(JSON.toJSONString(mesCombParam)); String response; try { response = new HttpHandler.Builder() .setUri(MesConstant.URL) .setPath(MesConstant.PACK_DOWN_URL) .setJson(JSON.toJSONString(param)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { log.info("请求接口成功!!!"); // log.info("请求接口成功!!!url:{};request:{};response:{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); } else { log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); throw new CoolException("上报mes系统失败"); } } catch (Exception e) { log.error("fail", e); e.printStackTrace(); throw new CoolException("上报mes系统失败"); } } // 生成入库单据 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,14 @@ package com.zy.asrs.task; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.zy.asrs.entity.Order; import com.zy.asrs.service.OrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; /** * Created by vincent on 2020/7/7 @@ -28,12 +32,23 @@ @Scheduled(cron = "0/3 * * * * ? ") private void completeAndReport(){ // for (WrkMast wrkMast : wrkMasts) { // ReturnT<String> result = workLogHandler.start(wrkMast); // if (!result.isSuccess()) { // log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo()); // 所有订单 List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); for (Order order : orders) { // OpenOrderCompeteResult result = new OpenOrderCompeteResult(); // results.add(result); // result.setOrderNo(order.getOrderNo()); // result.setOrderTime(order.getOrderTime()); // result.setOrderType(order.getDocType$()); // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // for (OrderDetl orderDetl : orderDetls) { // result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); // } // } // // 修改订单状态 4.完成 ===>> 6.已上报 // if (!orderService.updateSettle(order.getId(), 6L, null)) { // throw new CoolException("服务器内部错误,请联系管理员"); // } } } } src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -26,6 +26,10 @@ @ExceptionHandler(CoolException.class) public R handleRRException(CoolException e) { String[] split = e.getMessage().split("-"); if (split.length > 2) { return R.error(e.getMessage()); } return R.parse(e.getMessage()); } src/main/java/com/zy/common/constant/MesConstant.java
New file @@ -0,0 +1,13 @@ package com.zy.common.constant; /** * Created by vincent on 2022/4/21 */ public class MesConstant { public static final String URL = "http://192.168.1.72:8301"; public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList"; } src/main/java/com/zy/common/model/MesCombParam.java
New file @@ -0,0 +1,43 @@ package com.zy.common.model; import lombok.Data; import java.util.ArrayList; import java.util.List; /** * Created by vincent on 2022/4/21 */ @Data public class MesCombParam { // 托盘条码 private String zpallet; // 帮托时间 private String combTime; // 仓库编号 - 写死 private String lgort; private List<Detl> list = new ArrayList<>(); @Data public static class Detl { // 物料条码 private String barcode; // 数量 private Double anfme; public Detl() { } public Detl(String barcode, Double anfme) { this.barcode = barcode; this.anfme = anfme; } } }