| | |
| | | //获取对象集合循环进行新增修改 |
| | | List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class); |
| | | if (!orderDetaillist.isEmpty()){ |
| | | if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")){ |
| | | |
| | | if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")) { |
| | | return deliveryDetailLogic(orderDetaillist, savePoint, userName); |
| | | } |
| | | } |
| | |
| | | //修改订单表发货状态 |
| | | finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1); |
| | | //判断订单是否全部发货 |
| | | if (orderNumberdsum == orderDetail.getWarehouseNum()) { |
| | | if (Objects.equals(orderNumberdsum, orderDetail.getWarehouseNum())) { |
| | | //if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) { |
| | | //修改订单表发货状态 |
| | | finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2); |