From f35fc1f577af2cb76198a520f47b4c7b85fb170e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 十二月 2023 15:19:52 +0800
Subject: [PATCH] 合并订单bug修改
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 269 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index c3d1327..7d2b56e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,18 +1,66 @@
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.Cools;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.mapper.OrderMapper;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+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.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.mapper.OrderMapper;
+import com.zy.asrs.service.*;
+import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderDto;
+import com.zy.common.model.OrderMergeVo;
+import com.zy.common.service.erp.ErpService;
+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 java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
+@Slf4j
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private OpenService openService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private ManPakOutService manPakOutService;
+
+ @Value("${u8.url}")
+ private String url;
+
+ @Value("${u8.orderReportPath}")
+ private String orderReportPath;
@Override
public Order selectByNo(String orderNo) {
@@ -24,9 +72,221 @@
}
@Override
- public List<OrderDetl> selectWorkingDetls(String orderNo) {
-
- return null;
+ public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ return orderDetlMapper.selectWorkingDetls(orderId);
}
+ @Override
+ public boolean updateSettle(Long orderId, Long settle, Long userId) {
+ return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
+ }
+
+ @Override
+ public void checkComplete(String orderNo) {
+ Order order = this.selectByNo(orderNo);
+ if(Cools.isEmpty(order)){
+ return;
+ }
+ if (order.getSettle() >= 4L) {
+ return;
+ }
+ List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+ // 浣滀笟鏁伴噺鏄惁绛変簬鏁伴噺
+ boolean complete = true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
+ }
+ // 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
+ int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1;
+ boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",orderNo)) < 1;
+
+ ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+
+ boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+ if (!this.updateSettle(order.getId(), 4L, null)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+ }
+ }
+
+ }
+
+ @Override
+ public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ try {
+ List<DetlDto> detlDtos = new ArrayList<>();
+ wrkDetls.forEach(wrkDetl -> {
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+ });
+ String orderNo = "HAND" + snowflakeIdWorker.nextId();
+ if (pakin) {
+ // 鐢熸垚鍏ュ簱鍗曟嵁
+ OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+ openParam.setOrderNo(orderNo);
+ openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+ openParam.setOrderDetails(detlDtos);
+ openService.pakinOrderCreate(openParam);
+ } else {
+ // 鐢熸垚鍑哄簱鍗曟嵁
+ OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
+ openParam.setOrderNo(orderNo);
+ openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+ openParam.setOrderDetails(detlDtos);
+ openService.pakoutOrderCreate(openParam);
+ }
+
+ Order order = this.selectByNo(orderNo);
+ if (null == order) {
+ throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+ }
+ if (!this.updateSettle(order.getId(), 4L, null)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ for (DetlDto detlDto : detlDtos) {
+ // 淇敼璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme(),detlDto.getCsocode(),detlDto.getIsoseq())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 宸ヤ綔妗ｆ槑缁嗘洿鏂板崟鎹紪鍙�
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ }
+ } catch (Exception e) {
+ log.error("", e);
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void remove(Long orderId) {
+ if (!this.deleteById(orderId)) {
+ throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
+ }
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ }
+
+ public void report(Long orderId, String username) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Order order = this.selectById(orderId);
+ Map<String, Object> param = new HashMap<>();
+ param.put("id",order.getOrderNo());
+ param.put("dDate",sdf.format(new Date()));
+ param.put("cHandler",username);
+
+ List<Map<String,Object>> orderDetlsParam = new ArrayList<>();
+ param.put("orderDetails",orderDetlsParam);
+
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+
+ for (OrderDetl orderDetl : orderDetls){
+ Map<String, Object> odMap = new HashMap<>();
+ odMap.put("autoid",orderDetl.getItemNum());
+ odMap.put("iQuantity",orderDetl.getQty());
+ orderDetlsParam.add(odMap);
+ }
+
+ int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
+ //int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", "localhost:8080", "/test/report", null, "127.0.0.1");
+ if(code == 0){
+ order.setSettle(6L);
+ this.updateById(order);
+ }
+ }
+
+ @Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
+ public List<OrderMergeVo> mergePreview(List<Long> ids) {
+ List<OrderMergeVo> result = new ArrayList<>();
+ for (Long orderId : ids) {
+ Order order = this.selectById(orderId);
+ // 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
+ List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+ Double leave = orderDetl.getAnfme() - orderDetl.getQty();
+ OrderMergeVo vo = new OrderMergeVo(orderDetl.getMatnr(), orderDetl.getBatch(), leave);
+ OrderDto orderDto = new OrderDto(orderDetl.getOrderNo(), null,null, leave);
+ if (OrderMergeVo.has(result, vo)) {
+ OrderMergeVo exist = OrderMergeVo.find(result, vo.getMatnr(), vo.getBatch());
+ assert exist != null;
+ exist.setAnfme(exist.getAnfme() + vo.getAnfme());
+ exist.getOrderDtos().add(orderDto);
+ } else {
+ vo.getOrderDtos().add(orderDto);
+ result.add(vo);
+ }
+
+ }
+ }
+ for (OrderMergeVo vo : result) {
+ Mat mat = matService.selectByMatnr(vo.getMatnr());
+ assert mat != null;
+ vo.setMaktx(mat.getMaktx());
+ vo.setSpecs(mat.getSpecs());
+ }
+ return result;
+ }
+ @Override
+ public List<Order> selectorderNoL(String orderNo) {
+ return this.baseMapper.selectorderNoL(orderNo);
+ }
+
+ @Override
+ public List<Order> selectToBeHistoryOrder() {
+ return this.selectList(new EntityWrapper<Order>().eq("status",1).ge("settle",6));
+
+ //return this.baseMapper.selectToBeHistoryOrder();
+ }
+
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if(Cools.isEmpty(jsonObject.get("errCode"))){
+ throw new CoolException(jsonObject.get("Message").toString());
+ }
+
+ int code = (int) jsonObject.get("errCode");
+ if(code != 0){
+ throw new CoolException(jsonObject.get("errMsg").toString());
+ }
+ success = true;
+ return code;
+ }catch (Exception e){
+ log.error(e.getMessage());
+ throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ }finally {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
+ }
+
+ }
}
--
Gitblit v1.9.1