| | |
|---|
| | | Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId()); |
|---|
| | | //获取已经出库的数量 |
|---|
| | | Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0); |
|---|
| | | |
|---|
| | | Integer finishedOperateLogQuantitySum = finishedGoodsInventoryMapper.findFinishedOperateLogQuantity(orderDetail.getDeliveryDetail().getOrderId()); |
|---|
| | | if(finishedOperateLogQuantitySum==null){ |
|---|
| | | finishedOperateLogQuantitySum=0; |
|---|
| | | } |
|---|
| | | if(deliverydetailsum==null){ |
|---|
| | | deliverydetailsum=0; |
|---|
| | | } |
|---|
| | |
|---|
| | | //修改订单表发货状态 |
|---|
| | | finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1); |
|---|
| | | //判断订单是否全部发货 |
|---|
| | | if (orderNumberdsum==orderNumberdDeliverysum) { |
|---|
| | | if (ordersum==finishedOperateLogQuantitySum) { |
|---|
| | | //if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) { |
|---|
| | | //修改订单表发货状态 |
|---|
| | | finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | Map<String, Object> itemmap = new HashMap<>(); |
|---|
| | | itemmap.put("detail",finishedGoodsInventoryMapper.getPrintTitleByBox( |
|---|
| | | List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox( |
|---|
| | | finishedGoodsInventory.getOrder().getCustomerId(), |
|---|
| | | finishedGoodsInventory.getOrder().getProject(), |
|---|
| | | boxNo, |
|---|
| | | orderId |
|---|
| | | ) ); |
|---|
| | | ); |
|---|
| | | |
|---|
| | | itemmap.put("detail",detail); |
|---|
| | | //获取库存里面此订单此箱号的所有产品信息 |
|---|
| | | List<Map<String, Object>> detailList = finishedGoodsInventoryMapper |
|---|
| | | .getorderProductByBoxNo(orderId,boxNo); |
|---|
| | |
|---|
| | | for(Map<String, Object> details:detailList){ |
|---|
| | | Map<String, Object> detailsmap = new HashMap<>(); |
|---|
| | | detailsmap.put("product_name",details.get("product_name").toString()); |
|---|
| | | /*finishedOperateLogMapper |
|---|
| | | .getDetailLists( |
|---|
| | | finishedOperateLog.getOrderId(), |
|---|
| | | finishedOperateLog.getRemarks(), |
|---|
| | | Integer.valueOf(details.get("product_id").toString()), |
|---|
| | | details.get("thickness").toString() |
|---|
| | | );*/ |
|---|
| | | //获取明细数据 |
|---|
| | | List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper |
|---|
| | | .getPrintDetail( |
|---|
