xinzeng

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -617,7 +617,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    /**
     * 出货后，更新订单出货单状态
     * 出货后，更新订单出货单状态     1未出货，2已出货，3出货故障
     * @param shipmentLogId
     * @param status
     * @return
@@ -654,7 +654,14 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    medicineShipmentLog.getLayerNo(),
                    medicineShipmentLog.getWayerNo());
            inventory.setQty(String.valueOf(Integer.parseInt(inventory.getQty()) - 1));
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());
                //0缺货，1不缺货
                mediicinedevice.setStatus("0");
                deviceDao.save(mediicinedevice);
            }
            inventoryDao.save(inventory);
        }
        //查询更新订单信息start
        //订单id