From d9f9ec16b45ed0101e6afdb2beb4878524c339f3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 22 四月 2022 18:39:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 391ac3f..58d6f25 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -1,15 +1,23 @@ 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; +import com.core.common.DateUtils; +import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CombParam; 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; @@ -44,6 +52,10 @@ private WrkDetlService wrkDetlService; @Autowired private PackService packService; + @Autowired + private OpenService openService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; @Override @Transactional @@ -145,7 +157,7 @@ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } } - + orderService.updateSettle(order.getId(), 2L, userId); } } @@ -229,6 +241,7 @@ } @Override + @Transactional public void packComb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); @@ -269,16 +282,76 @@ }); 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())); + } + String response; + try { + response = new HttpHandler.Builder() + .setUri(MesConstant.URL) + .setPath(MesConstant.PACK_DOWN_URL) + .setJson(JSON.toJSONString(mesCombParam)) + .build() + .doPost(); + JSONObject jsonObject = JSON.parseObject(response); + if (jsonObject.getInteger("code").equals(200)) { + log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛�"); + } else if (jsonObject.getInteger("code").equals(500)) { + log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); + throw new CoolException(jsonObject.getString("msg")); + } else { + log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); + throw new CoolException("涓婃姤mes绯荤粺澶辫触"); + } + } catch (Exception e) { + log.error("fail", e); + throw new CoolException(e.getMessage()); + } + } + // 鐢熸垚鍏ュ簱鍗曟嵁 + String orderNo = "PACK" + snowflakeIdWorker.nextId(); + OpenOrderPakinParam openParam = new OpenOrderPakinParam(); + openParam.setOrderNo(orderNo); + openParam.setOrderTime(DateUtils.convert(now)); + openParam.setOrderType("鎵撳寘鍏ュ簱鍗�"); + openParam.setOrderDetails(detlDtos); + openService.pakinOrderCreate(openParam); + Order order = orderService.selectByNo(orderNo); + if (null == order) { + throw new CoolException("鐢熸垚鍗曟嵁澶辫触"); + } + if (!orderService.updateSettle(order.getId(), 2L, userId)) { + throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�"); + } + + // 鐢熸垚鍏ュ簱閫氱煡妗� for (DetlDto detlDto : detlDtos) { + + // 淇敼浣滀笟鏁伴噺 ---------------------------------------- + // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙 + OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch()); + if (detlDto.getAnfme() > orderDetl.getEnableQty()) { + throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�"); + } + // 淇敼璁㈠崟鏄庣粏鏁伴噺 + if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { + throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触"); + } + + // 淇濆瓨鍏ュ簱閫氱煡妗� Mat mat = matService.selectByMatnr(detlDto.getMatnr()); if (Cools.isEmpty(mat)) { throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�"); } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); + waitPakin.setOrderNo(orderNo); waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮� waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� @@ -300,6 +373,7 @@ throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父"); } } + } } -- Gitblit v1.9.1