luxiaotao1123
2021-06-18 c1702cc51a4d94ed37d5083494c87fe0f2cbe5b3
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -13,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.entity.Parameter;
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
@@ -58,6 +59,10 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private NodeService nodeService;
    /**
     * 商品下载
@@ -550,7 +555,7 @@
                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
                    getOrderResult0.setVchType(11); // todo:luxiaotao
                    getOrderResult0.setVchType(11);
                    getOrderResult0.setBillDate(order.getOrderTime());
                    getOrderResult0.setBTypeID(order.getTel());
                    getOrderResult0.setKTypeID("宏挺仓库");
@@ -570,8 +575,7 @@
                        list.add(detl0);
                    }
                    System.out.println(JSON.toJSONString(getOrderResult0));
                    log.warn(JSON.toJSONString(getOrderResult0));
                    String response = new HttpHandler.Builder()
                            .setUri(URI)
@@ -628,7 +632,7 @@
                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
                    getOrderResult0.setVchType(6); // todo:luxiaotao
                    getOrderResult0.setVchType(6);
                    getOrderResult0.setBillDate(order.getOrderTime());
                    getOrderResult0.setBTypeID(order.getTel());
                    getOrderResult0.setKTypeID("宏挺仓库");
@@ -772,8 +776,42 @@
                        Order order = orderService.selectByOrderNo(number);
                        if (order != null) {
                            if (order.getSettle() != 3L && order.getSettle() != 5L) {
                                if (!orderService.updateSettle(number, 5L)) {
//                            throw new CoolException("修改订单状态失败");
                                if (orderService.updateSettle(number, 5L)) {
                                    // 立库出库货位转至A99
                                    List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
                                            .eq("node_id", -1).eq("doc_num", number).ne("memo", "1"));
                                    Node node = nodeService.selectByUuid(Parameter.get().getUniNode());
                                    for (Pakout pakout : pakouts) {
                                        // 立库出库货位
                                        if (pakout.getLocNo().length() == 7) {
                                            LocDetl locDetl = locDetlService.getLocDetl(node.getId(), pakout.getMatnr());
                                            if (locDetl == null) {
                                                locDetl = new LocDetl();
                                                locDetl.setLocNo(node.getName());
                                                locDetl.setNodeId(node.getId());
                                                locDetl.setAnfme(pakout.getAnfme());
                                                VersionUtils.setLocDetl(locDetl, pakout);
                                                locDetl.setStatus(1);
                                                locDetl.setCreateBy(9527L);
                                                locDetl.setCreateTime(now);
                                                locDetl.setUpdateBy(9527L);
                                                locDetl.setUpdateTime(now);
                                                boolean insert = locDetlService.insert(locDetl);
                                                if (!insert) {
                                                    throw new CoolException("新增库存明细档失败");
                                                }
                                            } else {
                                                if (!locDetlService.incrementStock(node.getId(), pakout.getMatnr(), pakout.getAnfme())) {
                                                    throw new CoolException("新增库存明细档失败");
                                                }
                                            }
                                            if (!pakoutService.updateStep(pakout.getWrkNo(), pakout.getDocNum())) {
                                                throw new CoolException("取消订单后回滚立库拣货单失败");
                                            }
                                        }
                                    }
                                } else {
//                                    throw new CoolException("修改订单状态失败");
                                }
                            }
                        }