no message

skyouc

4 天以前 5d7d46792e0a2070c3044c3e961583261da3e6f0

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -30,6 +30,7 @@
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -73,6 +74,10 @@
    private OrderPakinService orderPakinService;
    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private OrderPakoutService orderPakoutService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;


    /**
@@ -371,22 +376,43 @@
            /** 不存在，新增订单 */
            generateOrders(params, type);
        } else {
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
            if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                throw new CoolException("订单已处理，不可再变更！！");
            }
            /** 存在，删除老订单，更新插入新订单 */
            if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                throw new CoolException("订单删除失败！！");
            }
            if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
                // 入库
                OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
                if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                    throw new CoolException("订单已处理，不可再变更！！");
                }
                /** 存在，删除老订单，更新插入新订单 */
                if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                    throw new CoolException("订单删除失败！！");
                }

            if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                throw new CoolException("主单删除失败！！");
                if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                    throw new CoolException("主单删除失败！！");
                }
            } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
                // 出库
               if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
                        || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType()) ||
                        OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
                    // 备货指示派工单（EO/SO）出库
                   OrderPakout orderPakin = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", order.getOrderNo()));
                   if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                       throw new CoolException("订单已处理，不可再变更！！");
                   }

                   /** 存在，删除老订单，更新插入新订单 */
                   if (!orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderPakin.getOrderNo()))) {
                       throw new CoolException("订单删除失败！！");
                   }

                   if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakin.getOrderNo()))) {
                       throw new CoolException("主单删除失败！！");
                   }
                } else {
                    throw new CoolException("单据类型不存在，不支持添加！！");
                }
            }
            // 删除旧订单明细
//            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
//                throw new CoolException("订单明细删除失败！！");
//            }

            order.setSettle(3L);
            if (!orderService.updateById(order)) {
@@ -878,9 +904,9 @@
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(userId);
            checkOrderDetl.setCreateTime(new Date());
//            checkOrderDetl.setCreateTime(new Date());
            checkOrderDetl.setUpdateBy(userId);
            checkOrderDetl.setUpdateTime(new Date());
//            checkOrderDetl.setUpdateTime(new Date());

            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");