| | |
| | | Integer offset = (pageNum - 1) * pageSize; |
| | | |
| | | Map<String, Object> map = new HashMap<>(); |
| | | System.out.println(orderDetail.getDeliveryDetail().getMoney()); |
| | | map.put("data", deliveryDetailMapper.getseletShippingOrderDetail(offset, pageSize, orderDetail)); |
| | | map.put("delivery", deliveryMapper.getseletShippingOrderDetaildelivery(offset, pageSize, orderDetail)); |
| | | map.put("total", deliveryDetailMapper.getseletShippingOrderDetailPageTotal(offset, pageSize, orderDetail)); |
| | |
| | | List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class); |
| | | //获取单号 |
| | | String oddNumber= orderNumberSetting("发货"); |
| | | System.out.println(delivery); |
| | | deliveryMapper.insertDelivery(delivery,oddNumber,orderDetaillist.get(0).getOrderId()); |
| | | Double area=0.0; |
| | | Integer quantity=0; |
| | |
| | | area+=orderDetail.getFinishedGoodsInventory().getActualSignalArea()*orderDetail.getDeliveryDetail().getQuantity(); |
| | | money+=orderDetail.getPrice()*orderDetail.getDeliveryDetail().getQuantity(); |
| | | Integer deliveryDetailmaximum=deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber); |
| | | System.out.println(deliveryDetailmaximum); |
| | | deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum); |
| | | deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum+1); |
| | | deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail); |
| | | //修改库存表出库数量 |
| | | finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity()); |
| | | isinsert=true; |
| | | } |
| | | System.out.println("面积"+area+"数量"+quantity+"金额"+money); |
| | | deliveryMapper.updatedelivery(area,quantity,money,oddNumber); |
| | | |
| | | deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)),quantity,Double.valueOf(String.format("%.2f", money)),oddNumber); |
| | | return isinsert; |
| | | }else{ |
| | | return false; |
| | |
| | | type = Integer.parseInt(object.get("type").toString()); |
| | | } |
| | | |
| | | System.out.println(deliveryId); |
| | | deliveryMapper.updateDeliveryToExamine(deliveryId,type); |
| | | |
| | | return true; |